diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 951b828..4cd3dbb 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  SOLUTION_FILE_PATH: projects\visual-studio\hfsm2-vs.sln
+  SOLUTION_FILE_PATH: projects\premake\hfsm2-vs.sln
 
 jobs:
   build:
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         BUILD_CONFIG: [ Release, Debug ]
-        BUILD_PLATFORM: [ x86, x64 ]
+        BUILD_PLATFORM: [ 32, 64 ]
 
     steps:
     - uses: actions/checkout@v4
@@ -31,4 +31,4 @@ jobs:
 
     - name: Test
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: binaries-${{matrix.BUILD_PLATFORM}}\test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe
+      run: "binaries/test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
diff --git a/.gitignore b/.gitignore
index 273b15d..02f3330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ cmake-*
 /projects/code-lite/test/test.mk
 /projects/visual-studio/.opencppcov
 /projects/visual-studio/*.log
+/pull.cmd
+/push.cmd
diff --git a/development/hfsm2/detail/features/logger_interface.hpp b/development/hfsm2/detail/features/logger_interface.hpp
index 11ed364..5311e57 100644
--- a/development/hfsm2/detail/features/logger_interface.hpp
+++ b/development/hfsm2/detail/features/logger_interface.hpp
@@ -35,7 +35,7 @@ struct LoggerInterfaceT {
 	void
 	recordMethod(const Context& HFSM2_UNUSED(context),
 				 const StateID HFSM2_UNUSED(origin),
-				 const Method HFSM2_UNUSED(method))						noexcept
+				 const Method HFSM2_UNUSED(method))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -44,7 +44,7 @@ struct LoggerInterfaceT {
 	recordTransition(const Context& HFSM2_UNUSED(context),
 					 const StateID HFSM2_UNUSED(origin),
 					 const TransitionType HFSM2_UNUSED(transitionType),
-					 const StateID HFSM2_UNUSED(target))				noexcept
+					 const StateID HFSM2_UNUSED(target))
 	{}
 
 #if HFSM2_PLANS_AVAILABLE()
@@ -55,7 +55,7 @@ struct LoggerInterfaceT {
 	recordTaskStatus(const Context& HFSM2_UNUSED(context),
 					 const RegionID HFSM2_UNUSED(region),
 					 const StateID HFSM2_UNUSED(origin),
-					 const StatusEvent HFSM2_UNUSED(event))				noexcept
+					 const StatusEvent HFSM2_UNUSED(event))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -63,7 +63,7 @@ struct LoggerInterfaceT {
 	void
 	recordPlanStatus(const Context& HFSM2_UNUSED(context),
 					 const RegionID HFSM2_UNUSED(region),
-					 const StatusEvent HFSM2_UNUSED(event))				noexcept
+					 const StatusEvent HFSM2_UNUSED(event))
 	{}
 
 #endif
@@ -72,7 +72,7 @@ struct LoggerInterfaceT {
 	virtual
 	void
 	recordCancelledPending(const Context& HFSM2_UNUSED(context),
-						   const StateID HFSM2_UNUSED(origin))			noexcept
+						   const StateID HFSM2_UNUSED(origin))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -80,7 +80,7 @@ struct LoggerInterfaceT {
 	void
 	recordSelectResolution(const Context& HFSM2_UNUSED(context),
 						   const StateID HFSM2_UNUSED(head),
-						   const Prong HFSM2_UNUSED(prong))				noexcept
+						   const Prong HFSM2_UNUSED(prong))
 	{}
 
 #if HFSM2_UTILITY_THEORY_AVAILABLE()
@@ -91,7 +91,7 @@ struct LoggerInterfaceT {
 	recordUtilityResolution(const Context& HFSM2_UNUSED(context),
 							const StateID HFSM2_UNUSED(head),
 							const Prong HFSM2_UNUSED(prong),
-							const Utilty HFSM2_UNUSED(utilty))			noexcept
+							const Utilty HFSM2_UNUSED(utilty))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -100,7 +100,7 @@ struct LoggerInterfaceT {
 	recordRandomResolution(const Context& HFSM2_UNUSED(context),
 						   const StateID HFSM2_UNUSED(head),
 						   const Prong HFSM2_UNUSED(prong),
-						   const Utilty HFSM2_UNUSED(utilty))			noexcept
+						   const Utilty HFSM2_UNUSED(utilty))
 	{}
 
 #endif
diff --git a/development/hfsm2/detail/shared/utility.hpp b/development/hfsm2/detail/shared/utility.hpp
index 73e69e6..91050c0 100644
--- a/development/hfsm2/detail/shared/utility.hpp
+++ b/development/hfsm2/detail/shared/utility.hpp
@@ -108,12 +108,12 @@ using Undecorate = RemoveConst<RemoveReference<T>>;
 
 template <typename T>
 struct IsValueReferenceT final {
-	static constexpr bool VALUE = false;
+	static const bool VALUE = false;
 };
 
 template <typename T>
 struct IsValueReferenceT<T&> final {
-	static constexpr bool VALUE = true;
+	static const bool VALUE = true;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -187,8 +187,10 @@ move(T&& t)																noexcept	{
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <typename T0,
-		  typename T1>
+template <
+	typename T0
+  , typename T1
+>
 HFSM2_CONSTEXPR(11)
 T0
 min(const T0 t0,
@@ -200,8 +202,10 @@ min(const T0 t0,
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-template <typename T0,
-		  typename T1>
+template <
+	typename T0
+  , typename T1
+>
 HFSM2_CONSTEXPR(11)
 T0
 max(const T0 t0,
@@ -213,9 +217,11 @@ max(const T0 t0,
 
 //------------------------------------------------------------------------------
 
-template <typename TIndex,
-		  typename TElement,
-		  TIndex NCount>
+template <
+	typename TIndex
+  , typename TElement
+  , TIndex NCount
+>
 HFSM2_CONSTEXPR(11)
 TIndex
 count(const TElement (&)[NCount])										noexcept	{
@@ -224,8 +230,10 @@ count(const TElement (&)[NCount])										noexcept	{
 
 //------------------------------------------------------------------------------
 
-template <typename T,
-		  typename TT>
+template <
+	typename T
+  , typename TT
+>
 HFSM2_CONSTEXPR(11)
 T
 contain(const T x,
@@ -238,8 +246,7 @@ contain(const T x,
 
 HFSM2_CONSTEXPR(11)
 uint64_t
-widen(const uint32_t x, const uint32_t y)								noexcept
-{
+widen(const uint32_t x, const uint32_t y)								noexcept	{
 	return static_cast<uint64_t>(x) << 32 | y;
 }
 
@@ -297,6 +304,14 @@ reinterpret(const TI& in)												noexcept	{
 	return out;
 }
 
+//------------------------------------------------------------------------------
+
+template<class T>
+HFSM2_CONSTEXPR(14)
+void destroy(T& t)														noexcept	{
+	t.~T();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 template <int>
diff --git a/development/hfsm2/machine_dev.hpp b/development/hfsm2/machine_dev.hpp
index b9f86a0..ec683e6 100644
--- a/development/hfsm2/machine_dev.hpp
+++ b/development/hfsm2/machine_dev.hpp
@@ -1,5 +1,5 @@
 // HFSM2 (hierarchical state machine for games and interactive applications)
-// 2.3.3 (2023-12-21)
+// 2.4.0 (2023-12-25)
 //
 // Created by Andrew Gresyk
 //
@@ -32,8 +32,8 @@
 #pragma once
 
 #define HFSM2_VERSION_MAJOR 2
-#define HFSM2_VERSION_MINOR 3
-#define HFSM2_VERSION_PATCH 3
+#define HFSM2_VERSION_MINOR 4
+#define HFSM2_VERSION_PATCH 0
 
 #define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)
 
diff --git a/examples/advanced_event_handling/main.cpp b/examples/advanced_event_handling/main.cpp
index 5fc3b7a..af07527 100644
--- a/examples/advanced_event_handling/main.cpp
+++ b/examples/advanced_event_handling/main.cpp
@@ -94,7 +94,7 @@ struct Reactive
 	: FSM::State
 {
 	// handle a single event type - TransitionEvent
-	void react(const TransitionEvent&, FullControl& control) noexcept {
+	void react(const TransitionEvent&, FullControl& control) {
 		std::cout << "  Reactive: reacting to TransitionEvent\n";
 
 		control.changeTo<Target>();
@@ -118,12 +118,12 @@ struct ConcreteHandler
 	: FSM::State
 {
 	// handle two event types - PrimaryEvent
-	void react(const PrimaryEvent&, FullControl&) noexcept {
+	void react(const PrimaryEvent&, FullControl&) {
 		std::cout << "  ConcreteHandler: reacting to PrimaryEvent\n";
 	}
 
 	// and SecondaryEvent
-	void react(const SecondaryEvent&, FullControl&) noexcept {
+	void react(const SecondaryEvent&, FullControl&) {
 		std::cout << "  ConcreteHandler: reacting to SecondaryEvent\n";
 	}
 
@@ -138,7 +138,7 @@ struct TemplateHandler
 {
 	// handle all possible event types
 	template <typename TEvent>
-	void react(const TEvent&, FullControl&) noexcept {
+	void react(const TEvent&, FullControl&) {
 		std::cout << "  TemplateHandler: reacting to TEvent\n";
 	}
 };
@@ -151,14 +151,14 @@ struct EnableIfHandler
 	// use std::enable_if to build more complex conditional event handling
 	template <typename TEvent>
 	typename std::enable_if<std::is_class<TEvent>::value>::type
-	react(const TEvent&, FullControl&) noexcept {
+	react(const TEvent&, FullControl&) {
 		std::cout << "  EnableIfHandler: reacting to a <class event>\n";
 	}
 
 	// but remember to cover all the remaining cases
 	template <typename TEvent>
 	typename std::enable_if<!std::is_class<TEvent>::value>::type
-	react(const TEvent&, FullControl&) noexcept {
+	react(const TEvent&, FullControl&) {
 		std::cout << "  EnableIfHandler: reacting to a <non-class event>\n";
 	}
 };
@@ -168,15 +168,14 @@ struct EnableIfHandler
 struct Target
 	: FSM::State
 {
-	void enter(Control&) noexcept {
+	void enter(Control&) {
 		std::cout << "    changed to Target\n";
 	}
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
-int
-main() noexcept {
+int main() {
 	FSM::Instance machine;
 
 	std::cout << "sending PrimaryEvent:\n";
diff --git a/examples/basic_audio_player/main.cpp b/examples/basic_audio_player/main.cpp
index f68a88f..05fae81 100644
--- a/examples/basic_audio_player/main.cpp
+++ b/examples/basic_audio_player/main.cpp
@@ -4,11 +4,11 @@
 // An HFSM2 port of https://gist.github.com/martinmoene/797b1923f9c6c1ae355bb2d6870be25e
 // by Martin Moene (see https://twitter.com/MartinMoene/status/1118453128834232320)
 
-#include <assert.h>
-
 #include <iostream>
 #include <string>
 
+#include <assert.h>
+
 #define HFSM2_ENABLE_LOG_INTERFACE
 #define HFSM2_ENABLE_STRUCTURE_REPORT
 #include <hfsm2/machine.hpp>
@@ -64,7 +64,7 @@ static_assert(FSM::stateId<Paused>()  ==  3, "");
 struct Logger
 	: M::LoggerInterface
 {
-	static const char* stateName(const StateID stateId) noexcept {
+	static const char* stateName(const StateID stateId) {
 		switch (stateId) {
 		case 1:
 			return "Idle";
@@ -81,7 +81,7 @@ struct Logger
 	void recordTransition(const Context& /*context*/,
 						  const StateID origin,
 						  const TransitionType /*transition*/,
-						  const StateID target) noexcept override
+						  const StateID target) override
 	{
 		std::cout << stateName(origin) << " -> " << stateName(target) << "\n";
 	}
@@ -94,7 +94,7 @@ struct Base
 	: FSM::State
 {
 	template <typename Event>
-	void react(const Event&, FullControl&) noexcept {
+	void react(const Event&, FullControl&) {
 		std::cout << "[unsupported transition]\n";
 	}
 };
@@ -105,7 +105,7 @@ struct Idle
 {
 	using Base::react;
 
-	void react(const Play& event, FullControl& control) noexcept {
+	void react(const Play& event, FullControl& control) {
 		control.context() = event.title;
 		control.changeTo<Playing>();
 	}
@@ -116,11 +116,11 @@ struct Playing
 {
 	using Base::react;
 
-	void react(const Pause&, FullControl& control) noexcept {
+	void react(const Pause&, FullControl& control) {
 		control.changeTo<Paused>();
 	}
 
-	void react(const Stop&, FullControl& control) noexcept {
+	void react(const Stop&, FullControl& control) {
 		control.changeTo<Idle>();
 	}
 };
@@ -130,19 +130,18 @@ struct Paused
 {
 	using Base::react;
 
-	void react(const Resume&, FullControl& control) noexcept {
+	void react(const Resume&, FullControl& control) {
 		control.changeTo<Playing>();
 	}
 
-	void react(const Stop&, FullControl& control) noexcept {
+	void react(const Stop&, FullControl& control) {
 		control.changeTo<Idle>();
 	}
 };
 
 //------------------------------------------------------------------------------
 
-int
-main() noexcept {
+int main() {
 	// construct everything
 	Context title;
 	Logger logger;
diff --git a/examples/basic_traffic_light/main.cpp b/examples/basic_traffic_light/main.cpp
index 478061b..62eba12 100644
--- a/examples/basic_traffic_light/main.cpp
+++ b/examples/basic_traffic_light/main.cpp
@@ -110,7 +110,7 @@ struct On
 	: FSM::State // necessary boilerplate!
 {
 	// called on state entry
-	void enter(Control& control) noexcept {
+	void enter(Control& control) {
 		control.context().cycleCount = 0;
 		std::cout << "On" << std::endl;
 	}
@@ -122,13 +122,13 @@ struct On
 struct Red
 	: FSM::State
 {
-	void enter(Control& control) noexcept {
+	void enter(Control& control) {
 		++control.context().cycleCount;
 		std::cout << "  Red" << std::endl;
 	}
 
 	// state can initiate transitions to _any_ other state
-	void update(FullControl& control) noexcept {
+	void update(FullControl& control) {
 		// multiple transitions can be initiated, can be useful in a hierarchy
 		if (control.context().cycleCount > 3)
 			control.changeTo<Off>();
@@ -142,11 +142,11 @@ struct Red
 struct YellowDownwards
 	: FSM::State
 {
-	void enter(Control&) noexcept {
+	void enter(Control&) {
 		std::cout << "    Yellow v" << std::endl;
 	}
 
-	void update(FullControl& control) noexcept {
+	void update(FullControl& control) {
 		control.changeTo<Green>();
 	}
 };
@@ -156,11 +156,11 @@ struct YellowDownwards
 struct YellowUpwards
 	: FSM::State
 {
-	void enter(Control&) noexcept {
+	void enter(Control&) {
 		std::cout << "    Yellow ^" << std::endl;
 	}
 
-	void update(FullControl& control) noexcept {
+	void update(FullControl& control) {
 		control.changeTo<Red>();
 	}
 };
@@ -170,11 +170,11 @@ struct YellowUpwards
 struct Green
 	: FSM::State
 {
-	void enter(Control&) noexcept {
+	void enter(Control&) {
 		std::cout << "      Green" << std::endl;
 	}
 
-	void update(FullControl& control) noexcept {
+	void update(FullControl& control) {
 		control.changeTo<YellowUpwards>();
 	}
 };
@@ -185,15 +185,14 @@ struct Green
 struct Off
 	: FSM::State
 {
-	void enter(Control&) noexcept {
+	void enter(Control&) {
 		std::cout << "Off" << std::endl;
 	}
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
-int
-main() noexcept {
+int main() {
 	// shared data storage instance
 	Context context;
 
diff --git a/examples/calculator/main.cpp b/examples/calculator/main.cpp
index d82b0b4..2835b4c 100644
--- a/examples/calculator/main.cpp
+++ b/examples/calculator/main.cpp
@@ -105,7 +105,7 @@ struct Context {
 	void insertInOperand2(int digit)
 	{
 		PRINTCALL;
-		if (decimalFactor != 1.0) //-V550
+		if (decimalFactor != 1.0)
 		{
 			operand2 += std::copysign(digit / decimalFactor, operand2);
 			decimalFactor *= 10.0;
@@ -135,7 +135,7 @@ struct Context {
 				return true;
 
 			case DIVIDE:
-				if (operand2 != 0.0) //-V550
+				if (operand2 != 0.0)
 				{
 					operand1 /= operand2;
 					return true;
@@ -845,7 +845,7 @@ int main()
 			case '-': { machine.react(Operator{MathOperator::MINUS}); break; }
 			case '*': { machine.react(Operator{MathOperator::MULTIPLY}); break; }
 			case '/': { machine.react(Operator{MathOperator::DIVIDE}); break; }
-			case '.': { machine.react(Point{}); break; } //-V1037
+			case '.': { machine.react(Point{}); break; }
 			case ',': { machine.react(Point{}); break; }
 			case '=': { machine.react(Equals{}); break; }
 			case 'x' : break;
diff --git a/examples/debug_logger_interface/main.cpp b/examples/debug_logger_interface/main.cpp
index 7a707d2..01f6692 100644
--- a/examples/debug_logger_interface/main.cpp
+++ b/examples/debug_logger_interface/main.cpp
@@ -90,7 +90,7 @@ struct Logger
 {
 	void recordMethod(const Context& /*context*/,
 					  const hfsm2::StateID /*origin*/,
-					  const Method method) noexcept override
+					  const Method method) override
 	{
 		std::cout //<< hfsm2::stateName(origin) << "::"
 				  << hfsm2::methodName(method) << "()\n";
@@ -99,7 +99,7 @@ struct Logger
 	void recordTransition(const Context& /*context*/,
 						  const hfsm2::StateID /*origin*/,
 						  const TransitionType transitionType,
-						  const hfsm2::StateID /*target*/) noexcept override
+						  const hfsm2::StateID /*target*/) override
 	{
 		std::cout //<< hfsm2::stateName(origin) << ": "
 				  << hfsm2::transitionName(transitionType) << "<"
@@ -115,12 +115,12 @@ struct Top
 	: FSM::State // necessary boilerplate!
 {
 	// all state methods:
-	void entryGuard(GuardControl&)					noexcept {}	// not going to be called in this example
-	void enter(Control&)							noexcept {}
-	void update(FullControl&)						noexcept {}
+	void entryGuard(GuardControl&)					{}	// not going to be called in this example
+	void enter(Control&)							{}
+	void update(FullControl&)						{}
 	template <typename TEvent>
-	void react(const TEvent&, FullControl&)			noexcept {}
-	void exit(Control&)								noexcept {}
+	void react(const TEvent&, FullControl&)			{}
+	void exit(Control&)								{}
 };
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -130,12 +130,12 @@ struct From
 	: FSM::State
 {
 	// all state methods:
-	void entryGuard(GuardControl&)					noexcept {}	// not going to be called in this example
-	void enter(Control&)							noexcept {}
-	void update(FullControl&)						noexcept {}
+	void entryGuard(GuardControl&)					{}	// not going to be called in this example
+	void enter(Control&)							{}
+	void update(FullControl&)						{}
 	template <typename TEvent>
-	void react(const TEvent&, FullControl& control)	noexcept { control.changeTo<To>(); }
-	void exit(Control&)								noexcept {}
+	void react(const TEvent&, FullControl& control)	{ control.changeTo<To>(); }
+	void exit(Control&)								{}
 };
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -145,18 +145,17 @@ struct To
 	: FSM::State
 {
 	// all state methods:
-	void entryGuard(GuardControl&)					noexcept {}
-	void enter(Control&)							noexcept {}
-	void update(FullControl&)						noexcept {}
+	void entryGuard(GuardControl&)					{}
+	void enter(Control&)							{}
+	void update(FullControl&)						{}
 	template <typename TEvent>
-	void react(const TEvent&, FullControl&)			noexcept {}	// not going to be called in this example
-	void exit(Control&)								noexcept {}
+	void react(const TEvent&, FullControl&)			{}	// not going to be called in this example
+	void exit(Control&)								{}
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
-int
-main() noexcept {
+int main() {
 	{
 		// logger
 		Logger logger;
diff --git a/include/hfsm2/machine.hpp b/include/hfsm2/machine.hpp
index 14f0ae3..2a73622 100644
--- a/include/hfsm2/machine.hpp
+++ b/include/hfsm2/machine.hpp
@@ -1,5 +1,5 @@
 // HFSM2 (hierarchical state machine for games and interactive applications)
-// 2.3.3 (2023-12-21)
+// 2.4.0 (2023-12-25)
 //
 // Created by Andrew Gresyk
 //
@@ -32,8 +32,8 @@
 #pragma once
 
 #define HFSM2_VERSION_MAJOR 2
-#define HFSM2_VERSION_MINOR 3
-#define HFSM2_VERSION_PATCH 3
+#define HFSM2_VERSION_MINOR 4
+#define HFSM2_VERSION_PATCH 0
 
 #define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)
 
@@ -466,12 +466,12 @@ using Undecorate = RemoveConst<RemoveReference<T>>;
 
 template <typename T>
 struct IsValueReferenceT final {
-	static constexpr bool VALUE = false;
+	static const bool VALUE = false;
 };
 
 template <typename T>
 struct IsValueReferenceT<T&> final {
-	static constexpr bool VALUE = true;
+	static const bool VALUE = true;
 };
 
 template <uint64_t N>
@@ -529,8 +529,10 @@ move(T&& t)																noexcept	{
 	return static_cast<RemoveReference<T>&&>(t);
 }
 
-template <typename T0,
-		  typename T1>
+template <
+	typename T0
+  , typename T1
+>
 HFSM2_CONSTEXPR(11)
 T0
 min(const T0 t0,
@@ -540,8 +542,10 @@ min(const T0 t0,
 		   t0 : static_cast<T0>(t1);
 }
 
-template <typename T0,
-		  typename T1>
+template <
+	typename T0
+  , typename T1
+>
 HFSM2_CONSTEXPR(11)
 T0
 max(const T0 t0,
@@ -551,17 +555,21 @@ max(const T0 t0,
 		   t0 : static_cast<T0>(t1);
 }
 
-template <typename TIndex,
-		  typename TElement,
-		  TIndex NCount>
+template <
+	typename TIndex
+  , typename TElement
+  , TIndex NCount
+>
 HFSM2_CONSTEXPR(11)
 TIndex
 count(const TElement (&)[NCount])										noexcept	{
 	return NCount;
 }
 
-template <typename T,
-		  typename TT>
+template <
+	typename T
+  , typename TT
+>
 HFSM2_CONSTEXPR(11)
 T
 contain(const T x,
@@ -572,8 +580,7 @@ contain(const T x,
 
 HFSM2_CONSTEXPR(11)
 uint64_t
-widen(const uint32_t x, const uint32_t y)								noexcept
-{
+widen(const uint32_t x, const uint32_t y)								noexcept	{
 	return static_cast<uint64_t>(x) << 32 | y;
 }
 
@@ -623,6 +630,12 @@ reinterpret(const TI& in)												noexcept	{
 	return out;
 }
 
+template<class T>
+HFSM2_CONSTEXPR(14)
+void destroy(T& t)														noexcept	{
+	t.~T();
+}
+
 template <int>
 struct StaticPrintConstT;
 
@@ -2635,7 +2648,7 @@ struct LoggerInterfaceT {
 	void
 	recordMethod(const Context& HFSM2_UNUSED(context),
 				 const StateID HFSM2_UNUSED(origin),
-				 const Method HFSM2_UNUSED(method))						noexcept
+				 const Method HFSM2_UNUSED(method))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -2644,7 +2657,7 @@ struct LoggerInterfaceT {
 	recordTransition(const Context& HFSM2_UNUSED(context),
 					 const StateID HFSM2_UNUSED(origin),
 					 const TransitionType HFSM2_UNUSED(transitionType),
-					 const StateID HFSM2_UNUSED(target))				noexcept
+					 const StateID HFSM2_UNUSED(target))
 	{}
 
 #if HFSM2_PLANS_AVAILABLE()
@@ -2655,7 +2668,7 @@ struct LoggerInterfaceT {
 	recordTaskStatus(const Context& HFSM2_UNUSED(context),
 					 const RegionID HFSM2_UNUSED(region),
 					 const StateID HFSM2_UNUSED(origin),
-					 const StatusEvent HFSM2_UNUSED(event))				noexcept
+					 const StatusEvent HFSM2_UNUSED(event))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -2663,7 +2676,7 @@ struct LoggerInterfaceT {
 	void
 	recordPlanStatus(const Context& HFSM2_UNUSED(context),
 					 const RegionID HFSM2_UNUSED(region),
-					 const StatusEvent HFSM2_UNUSED(event))				noexcept
+					 const StatusEvent HFSM2_UNUSED(event))
 	{}
 
 #endif
@@ -2672,7 +2685,7 @@ struct LoggerInterfaceT {
 	virtual
 	void
 	recordCancelledPending(const Context& HFSM2_UNUSED(context),
-						   const StateID HFSM2_UNUSED(origin))			noexcept
+						   const StateID HFSM2_UNUSED(origin))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -2680,7 +2693,7 @@ struct LoggerInterfaceT {
 	void
 	recordSelectResolution(const Context& HFSM2_UNUSED(context),
 						   const StateID HFSM2_UNUSED(head),
-						   const Prong HFSM2_UNUSED(prong))				noexcept
+						   const Prong HFSM2_UNUSED(prong))
 	{}
 
 #if HFSM2_UTILITY_THEORY_AVAILABLE()
@@ -2691,7 +2704,7 @@ struct LoggerInterfaceT {
 	recordUtilityResolution(const Context& HFSM2_UNUSED(context),
 							const StateID HFSM2_UNUSED(head),
 							const Prong HFSM2_UNUSED(prong),
-							const Utilty HFSM2_UNUSED(utilty))			noexcept
+							const Utilty HFSM2_UNUSED(utilty))
 	{}
 
 	HFSM2_CONSTEXPR(NO)
@@ -2700,7 +2713,7 @@ struct LoggerInterfaceT {
 	recordRandomResolution(const Context& HFSM2_UNUSED(context),
 						   const StateID HFSM2_UNUSED(head),
 						   const Prong HFSM2_UNUSED(prong),
-						   const Utilty HFSM2_UNUSED(utilty))			noexcept
+						   const Utilty HFSM2_UNUSED(utilty))
 	{}
 
 #endif
diff --git a/premake.lua b/premake.lua
index dd79d81..ba53c63 100644
--- a/premake.lua
+++ b/premake.lua
@@ -1,7 +1,7 @@
 workspace "hfsm2"
 	configurations {
-		"debug",
-		"release"
+		"Debug",
+		"Release"
 	}
 	conformancemode "On"
 	debugdir "."
@@ -23,15 +23,15 @@ workspace "hfsm2"
 	location "projects/premake"
 	objdir "$(BUILD_ROOT)/$(SolutionName)-$(PlatformArchitecture)/$(ProjectName)-$(Configuration)/"
 	platforms {
-		"32",
-		"64",
+		"x86",
+		"x64",
 	}
 
 	system "windows"
 	systemversion "latest"
 	--systemversion "$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))"
 
-	targetdir "binaries-$(PlatformArchitecture)/"
+	targetdir "binaries/"
 	targetname "$(ProjectName)-$(Configuration)-$(PlatformArchitecture)"
 	warnings "High"
 
@@ -282,60 +282,12 @@ project "debug_logger_interface-clang"
 	kind "ConsoleApp"
 	toolset "msc-ClangCL"
 
--- snippets
-
-project "snippets-14"
-	cppdialect "C++11"
-	files {
-		"development/**.*",
-		"snippets/**.*",
-	}
-	kind "ConsoleApp"
-	toolset "msc-v140"
-
-project "snippets-15"
-	cppdialect "C++14"
-	files {
-		"development/**.*",
-		"snippets/**.*",
-	}
-	kind "ConsoleApp"
-	toolset "msc-v141"
-
-project "snippets-16"
-	cppdialect "C++17"
-	files {
-		"development/**.*",
-		"snippets/**.*",
-	}
-	kind "ConsoleApp"
-	toolset "msc-v142"
-
-project "snippets-17"
-	cppdialect "C++20"
-	files {
-		"development/**.*",
-		"snippets/**.*",
-	}
-	kind "ConsoleApp"
-	toolset "msc-v143"
-
-project "snippets-clang"
-	cppdialect "C++20"
-	files {
-		"development/**.*",
-		"snippets/**.*",
-	}
-	kind "ConsoleApp"
-	toolset "msc-ClangCL"
-
 -- temp
 
 project "temp-14"
 	cppdialect "C++11"
 	files {
-		"development/**.*",
-		"temp/**.*",
+		"examples/temp/**.*",
 	}
 	kind "ConsoleApp"
 	toolset "msc-v140"
@@ -343,8 +295,7 @@ project "temp-14"
 project "temp-15"
 	cppdialect "C++14"
 	files {
-		"development/**.*",
-		"temp/**.*",
+		"examples/temp/**.*",
 	}
 	kind "ConsoleApp"
 	toolset "msc-v141"
@@ -352,8 +303,7 @@ project "temp-15"
 project "temp-16"
 	cppdialect "C++17"
 	files {
-		"development/**.*",
-		"temp/**.*",
+		"examples/temp/**.*",
 	}
 	kind "ConsoleApp"
 	toolset "msc-v142"
@@ -361,8 +311,7 @@ project "temp-16"
 project "temp-17"
 	cppdialect "C++20"
 	files {
-		"development/**.*",
-		"temp/**.*",
+		"examples/temp/**.*",
 	}
 	kind "ConsoleApp"
 	toolset "msc-v143"
@@ -370,8 +319,7 @@ project "temp-17"
 project "temp-clang"
 	cppdialect "C++20"
 	files {
-		"development/**.*",
-		"temp/**.*",
+		"examples/temp/**.*",
 	}
 	kind "ConsoleApp"
 	toolset "msc-ClangCL"
diff --git a/projects/premake/advanced_event_handling-14.vcxproj b/projects/premake/advanced_event_handling-14.vcxproj
index befdb13..5e30f11 100644
--- a/projects/premake/advanced_event_handling-14.vcxproj
+++ b/projects/premake/advanced_event_handling-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>advanced_event_handling-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\advanced_event_handling-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\advanced_event_handling-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\advanced_event_handling-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\advanced_event_handling-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/advanced_event_handling-15.vcxproj b/projects/premake/advanced_event_handling-15.vcxproj
index debb281..6ece159 100644
--- a/projects/premake/advanced_event_handling-15.vcxproj
+++ b/projects/premake/advanced_event_handling-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>advanced_event_handling-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\advanced_event_handling-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\advanced_event_handling-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\advanced_event_handling-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\advanced_event_handling-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/advanced_event_handling-16.vcxproj b/projects/premake/advanced_event_handling-16.vcxproj
index 319b706..9db0ebe 100644
--- a/projects/premake/advanced_event_handling-16.vcxproj
+++ b/projects/premake/advanced_event_handling-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\advanced_event_handling-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\advanced_event_handling-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\advanced_event_handling-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\advanced_event_handling-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/advanced_event_handling-17.vcxproj b/projects/premake/advanced_event_handling-17.vcxproj
index f9bf04a..d581401 100644
--- a/projects/premake/advanced_event_handling-17.vcxproj
+++ b/projects/premake/advanced_event_handling-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\advanced_event_handling-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\advanced_event_handling-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\advanced_event_handling-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\advanced_event_handling-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/advanced_event_handling-clang.vcxproj b/projects/premake/advanced_event_handling-clang.vcxproj
index c7ba3e9..3bcfb07 100644
--- a/projects/premake/advanced_event_handling-clang.vcxproj
+++ b/projects/premake/advanced_event_handling-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\advanced_event_handling-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\advanced_event_handling-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\advanced_event_handling-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\advanced_event_handling-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_audio_player-14.vcxproj b/projects/premake/basic_audio_player-14.vcxproj
index ac6baf2..3fcce28 100644
--- a/projects/premake/basic_audio_player-14.vcxproj
+++ b/projects/premake/basic_audio_player-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>basic_audio_player-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_audio_player-15.vcxproj b/projects/premake/basic_audio_player-15.vcxproj
index f16e8a7..8dacfd1 100644
--- a/projects/premake/basic_audio_player-15.vcxproj
+++ b/projects/premake/basic_audio_player-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>basic_audio_player-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_audio_player-16.vcxproj b/projects/premake/basic_audio_player-16.vcxproj
index 5de340e..a96dccb 100644
--- a/projects/premake/basic_audio_player-16.vcxproj
+++ b/projects/premake/basic_audio_player-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_audio_player-17.vcxproj b/projects/premake/basic_audio_player-17.vcxproj
index ee0593f..0db964b 100644
--- a/projects/premake/basic_audio_player-17.vcxproj
+++ b/projects/premake/basic_audio_player-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_audio_player-clang.vcxproj b/projects/premake/basic_audio_player-clang.vcxproj
index 87f111b..8dbab04 100644
--- a/projects/premake/basic_audio_player-clang.vcxproj
+++ b/projects/premake/basic_audio_player-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_traffic_light-14.vcxproj b/projects/premake/basic_traffic_light-14.vcxproj
index 9a89755..3431435 100644
--- a/projects/premake/basic_traffic_light-14.vcxproj
+++ b/projects/premake/basic_traffic_light-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>basic_traffic_light-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_traffic_light-15.vcxproj b/projects/premake/basic_traffic_light-15.vcxproj
index a9a9c56..4486fc7 100644
--- a/projects/premake/basic_traffic_light-15.vcxproj
+++ b/projects/premake/basic_traffic_light-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>basic_traffic_light-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_traffic_light-16.vcxproj b/projects/premake/basic_traffic_light-16.vcxproj
index 4e6b92b..74d2fc4 100644
--- a/projects/premake/basic_traffic_light-16.vcxproj
+++ b/projects/premake/basic_traffic_light-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_traffic_light-17.vcxproj b/projects/premake/basic_traffic_light-17.vcxproj
index 8f12f4e..0814f7e 100644
--- a/projects/premake/basic_traffic_light-17.vcxproj
+++ b/projects/premake/basic_traffic_light-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/basic_traffic_light-clang.vcxproj b/projects/premake/basic_traffic_light-clang.vcxproj
index c9840a3..8b0de91 100644
--- a/projects/premake/basic_traffic_light-clang.vcxproj
+++ b/projects/premake/basic_traffic_light-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/calculator-14.vcxproj b/projects/premake/calculator-14.vcxproj
index e7deaa9..4035df7 100644
--- a/projects/premake/calculator-14.vcxproj
+++ b/projects/premake/calculator-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>calculator-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\calculator-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\calculator-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\calculator-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\calculator-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/calculator-15.vcxproj b/projects/premake/calculator-15.vcxproj
index 290a49d..119a5b8 100644
--- a/projects/premake/calculator-15.vcxproj
+++ b/projects/premake/calculator-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>calculator-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\calculator-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\calculator-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\calculator-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\calculator-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/calculator-16.vcxproj b/projects/premake/calculator-16.vcxproj
index 49adbc9..6c78bcd 100644
--- a/projects/premake/calculator-16.vcxproj
+++ b/projects/premake/calculator-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\calculator-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\calculator-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\calculator-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\calculator-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/calculator-17.vcxproj b/projects/premake/calculator-17.vcxproj
index 22eaa9c..c3566ba 100644
--- a/projects/premake/calculator-17.vcxproj
+++ b/projects/premake/calculator-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\calculator-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\calculator-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\calculator-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\calculator-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/calculator-clang.vcxproj b/projects/premake/calculator-clang.vcxproj
index 7d8ccaf..265cd4d 100644
--- a/projects/premake/calculator-clang.vcxproj
+++ b/projects/premake/calculator-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\calculator-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\calculator-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\calculator-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\calculator-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/debug_logger_interface-14.vcxproj b/projects/premake/debug_logger_interface-14.vcxproj
index 7ee9473..f14edc0 100644
--- a/projects/premake/debug_logger_interface-14.vcxproj
+++ b/projects/premake/debug_logger_interface-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>debug_logger_interface-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/debug_logger_interface-15.vcxproj b/projects/premake/debug_logger_interface-15.vcxproj
index d1af47f..c8ceccf 100644
--- a/projects/premake/debug_logger_interface-15.vcxproj
+++ b/projects/premake/debug_logger_interface-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>debug_logger_interface-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/debug_logger_interface-16.vcxproj b/projects/premake/debug_logger_interface-16.vcxproj
index 0a4004b..1400da5 100644
--- a/projects/premake/debug_logger_interface-16.vcxproj
+++ b/projects/premake/debug_logger_interface-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/debug_logger_interface-17.vcxproj b/projects/premake/debug_logger_interface-17.vcxproj
index 944d697..1ffcdc3 100644
--- a/projects/premake/debug_logger_interface-17.vcxproj
+++ b/projects/premake/debug_logger_interface-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/debug_logger_interface-clang.vcxproj b/projects/premake/debug_logger_interface-clang.vcxproj
index 1d9b5cf..385cb0a 100644
--- a/projects/premake/debug_logger_interface-clang.vcxproj
+++ b/projects/premake/debug_logger_interface-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
diff --git a/projects/premake/hfsm2-all.sln b/projects/premake/hfsm2-all.sln
index 50c3dbb..e3eb1c0 100644
--- a/projects/premake/hfsm2-all.sln
+++ b/projects/premake/hfsm2-all.sln
@@ -51,16 +51,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-17",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-clang", "debug_logger_interface-clang.vcxproj", "{4D843E1B-393F-2EC7-E2F6-A611CE907857}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "snippets-14", "snippets-14.vcxproj", "{0D98F755-794D-704B-0242-6A226EF6664F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "snippets-15", "snippets-15.vcxproj", "{0E98F755-7A4D-704B-0342-6A226FF6664F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "snippets-16", "snippets-16.vcxproj", "{0F98F755-7B4D-704B-0442-6A2270F6664F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "snippets-17", "snippets-17.vcxproj", "{1098F755-7C4D-704B-0542-6A2271F6664F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "snippets-clang", "snippets-clang.vcxproj", "{8DE2A0FD-79B0-9403-6244-052A4EB17068}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-14", "temp-14.vcxproj", "{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-15", "temp-15.vcxproj", "{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}"
@@ -83,332 +73,292 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-clang", "test-clang.vc
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		debug|32 = debug|32
-		debug|64 = debug|64
-		release|32 = release|32
-		release|64 = release|64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.debug|32.ActiveCfg = debug 32|Win32
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.debug|32.Build.0 = debug 32|Win32
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.debug|64.ActiveCfg = debug 64|x64
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.debug|64.Build.0 = debug 64|x64
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.release|32.ActiveCfg = release 32|Win32
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.release|32.Build.0 = release 32|Win32
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.release|64.ActiveCfg = release 64|x64
-		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.release|64.Build.0 = release 64|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.debug|32.ActiveCfg = debug 32|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.debug|32.Build.0 = debug 32|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.debug|64.ActiveCfg = debug 64|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.debug|64.Build.0 = debug 64|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.release|32.ActiveCfg = release 32|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.release|32.Build.0 = release 32|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.release|64.ActiveCfg = release 64|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.release|64.Build.0 = release 64|x64
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.debug|32.ActiveCfg = debug 32|Win32
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.debug|32.Build.0 = debug 32|Win32
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.debug|64.ActiveCfg = debug 64|x64
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.debug|64.Build.0 = debug 64|x64
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.release|32.ActiveCfg = release 32|Win32
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.release|32.Build.0 = release 32|Win32
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.release|64.ActiveCfg = release 64|x64
-		{F4F0D850-E000-8521-49BA-E93F35E973BA}.release|64.Build.0 = release 64|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.debug|32.ActiveCfg = debug 32|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.debug|32.Build.0 = debug 32|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.debug|64.ActiveCfg = debug 64|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.debug|64.Build.0 = debug 64|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.release|32.ActiveCfg = release 32|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.release|32.Build.0 = release 32|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.release|64.ActiveCfg = release 64|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.release|64.Build.0 = release 64|x64
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.debug|32.ActiveCfg = debug 32|Win32
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.debug|32.Build.0 = debug 32|Win32
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.debug|64.ActiveCfg = debug 64|x64
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.debug|64.Build.0 = debug 64|x64
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.release|32.ActiveCfg = release 32|Win32
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.release|32.Build.0 = release 32|Win32
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.release|64.ActiveCfg = release 64|x64
-		{52CDA049-BEE5-8773-8792-170DF3691C0D}.release|64.Build.0 = release 64|x64
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|32.ActiveCfg = debug 32|Win32
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|32.Build.0 = debug 32|Win32
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|64.ActiveCfg = debug 64|x64
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|64.Build.0 = debug 64|x64
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|32.ActiveCfg = release 32|Win32
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|32.Build.0 = release 32|Win32
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|64.ActiveCfg = release 64|x64
-		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|64.Build.0 = release 64|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|32.ActiveCfg = debug 32|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|32.Build.0 = debug 32|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|64.ActiveCfg = debug 64|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|64.Build.0 = debug 64|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|32.ActiveCfg = release 32|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|32.Build.0 = release 32|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|64.ActiveCfg = release 64|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|64.Build.0 = release 64|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|32.ActiveCfg = debug 32|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|32.Build.0 = debug 32|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|64.ActiveCfg = debug 64|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|64.Build.0 = debug 64|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|32.ActiveCfg = release 32|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|32.Build.0 = release 32|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|64.ActiveCfg = release 64|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|64.Build.0 = release 64|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|32.ActiveCfg = debug 32|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|32.Build.0 = debug 32|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|64.ActiveCfg = debug 64|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|64.Build.0 = debug 64|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|32.ActiveCfg = release 32|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|32.Build.0 = release 32|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|64.ActiveCfg = release 64|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|64.Build.0 = release 64|x64
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|32.ActiveCfg = debug 32|Win32
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|32.Build.0 = debug 32|Win32
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|64.ActiveCfg = debug 64|x64
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|64.Build.0 = debug 64|x64
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|32.ActiveCfg = release 32|Win32
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|32.Build.0 = release 32|Win32
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|64.ActiveCfg = release 64|x64
-		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|64.Build.0 = release 64|x64
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|32.ActiveCfg = debug 32|Win32
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|32.Build.0 = debug 32|Win32
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|64.ActiveCfg = debug 64|x64
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|64.Build.0 = debug 64|x64
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|32.ActiveCfg = release 32|Win32
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|32.Build.0 = release 32|Win32
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|64.ActiveCfg = release 64|x64
-		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|64.Build.0 = release 64|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|32.ActiveCfg = debug 32|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|32.Build.0 = debug 32|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|64.ActiveCfg = debug 64|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|64.Build.0 = debug 64|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|32.ActiveCfg = release 32|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|32.Build.0 = release 32|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|64.ActiveCfg = release 64|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|64.Build.0 = release 64|x64
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|32.ActiveCfg = debug 32|Win32
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|32.Build.0 = debug 32|Win32
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|64.ActiveCfg = debug 64|x64
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|64.Build.0 = debug 64|x64
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|32.ActiveCfg = release 32|Win32
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|32.Build.0 = release 32|Win32
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|64.ActiveCfg = release 64|x64
-		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|64.Build.0 = release 64|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|32.ActiveCfg = debug 32|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|32.Build.0 = debug 32|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|64.ActiveCfg = debug 64|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|64.Build.0 = debug 64|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|32.ActiveCfg = release 32|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|32.Build.0 = release 32|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|64.ActiveCfg = release 64|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|64.Build.0 = release 64|x64
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|32.ActiveCfg = debug 32|Win32
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|32.Build.0 = debug 32|Win32
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|64.ActiveCfg = debug 64|x64
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|64.Build.0 = debug 64|x64
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|32.ActiveCfg = release 32|Win32
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|32.Build.0 = release 32|Win32
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|64.ActiveCfg = release 64|x64
-		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|64.Build.0 = release 64|x64
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.debug|32.ActiveCfg = debug 32|Win32
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.debug|32.Build.0 = debug 32|Win32
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.debug|64.ActiveCfg = debug 64|x64
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.debug|64.Build.0 = debug 64|x64
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.release|32.ActiveCfg = release 32|Win32
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.release|32.Build.0 = release 32|Win32
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.release|64.ActiveCfg = release 64|x64
-		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.release|64.Build.0 = release 64|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.debug|32.ActiveCfg = debug 32|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.debug|32.Build.0 = debug 32|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.debug|64.ActiveCfg = debug 64|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.debug|64.Build.0 = debug 64|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.release|32.ActiveCfg = release 32|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.release|32.Build.0 = release 32|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.release|64.ActiveCfg = release 64|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.release|64.Build.0 = release 64|x64
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.debug|32.ActiveCfg = debug 32|Win32
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.debug|32.Build.0 = debug 32|Win32
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.debug|64.ActiveCfg = debug 64|x64
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.debug|64.Build.0 = debug 64|x64
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.release|32.ActiveCfg = release 32|Win32
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.release|32.Build.0 = release 32|Win32
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.release|64.ActiveCfg = release 64|x64
-		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.release|64.Build.0 = release 64|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.debug|32.ActiveCfg = debug 32|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.debug|32.Build.0 = debug 32|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.debug|64.ActiveCfg = debug 64|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.debug|64.Build.0 = debug 64|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.release|32.ActiveCfg = release 32|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.release|32.Build.0 = release 32|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.release|64.ActiveCfg = release 64|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.release|64.Build.0 = release 64|x64
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.debug|32.ActiveCfg = debug 32|Win32
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.debug|32.Build.0 = debug 32|Win32
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.debug|64.ActiveCfg = debug 64|x64
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.debug|64.Build.0 = debug 64|x64
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.release|32.ActiveCfg = release 32|Win32
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.release|32.Build.0 = release 32|Win32
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.release|64.ActiveCfg = release 64|x64
-		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.release|64.Build.0 = release 64|x64
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|32.ActiveCfg = debug 32|Win32
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|32.Build.0 = debug 32|Win32
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|64.ActiveCfg = debug 64|x64
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|64.Build.0 = debug 64|x64
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.release|32.ActiveCfg = release 32|Win32
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.release|32.Build.0 = release 32|Win32
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.release|64.ActiveCfg = release 64|x64
-		{CD91E21A-3954-16A5-8204-A531EE05EF82}.release|64.Build.0 = release 64|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|32.ActiveCfg = debug 32|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|32.Build.0 = debug 32|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|64.ActiveCfg = debug 64|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|64.Build.0 = debug 64|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|32.ActiveCfg = release 32|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|32.Build.0 = release 32|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|64.ActiveCfg = release 64|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|64.Build.0 = release 64|x64
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|32.ActiveCfg = debug 32|Win32
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|32.Build.0 = debug 32|Win32
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|64.ActiveCfg = debug 64|x64
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|64.Build.0 = debug 64|x64
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.release|32.ActiveCfg = release 32|Win32
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.release|32.Build.0 = release 32|Win32
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.release|64.ActiveCfg = release 64|x64
-		{CF91E21A-3B54-16A5-8404-A531F005EF82}.release|64.Build.0 = release 64|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.debug|32.ActiveCfg = debug 32|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.debug|32.Build.0 = debug 32|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.debug|64.ActiveCfg = debug 64|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.debug|64.Build.0 = debug 64|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.release|32.ActiveCfg = release 32|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.release|32.Build.0 = release 32|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.release|64.ActiveCfg = release 64|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.release|64.Build.0 = release 64|x64
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|32.ActiveCfg = debug 32|Win32
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|32.Build.0 = debug 32|Win32
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|64.ActiveCfg = debug 64|x64
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|64.Build.0 = debug 64|x64
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|32.ActiveCfg = release 32|Win32
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|32.Build.0 = release 32|Win32
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|64.ActiveCfg = release 64|x64
-		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|64.Build.0 = release 64|x64
-		{0D98F755-794D-704B-0242-6A226EF6664F}.debug|32.ActiveCfg = debug 32|Win32
-		{0D98F755-794D-704B-0242-6A226EF6664F}.debug|32.Build.0 = debug 32|Win32
-		{0D98F755-794D-704B-0242-6A226EF6664F}.debug|64.ActiveCfg = debug 64|x64
-		{0D98F755-794D-704B-0242-6A226EF6664F}.debug|64.Build.0 = debug 64|x64
-		{0D98F755-794D-704B-0242-6A226EF6664F}.release|32.ActiveCfg = release 32|Win32
-		{0D98F755-794D-704B-0242-6A226EF6664F}.release|32.Build.0 = release 32|Win32
-		{0D98F755-794D-704B-0242-6A226EF6664F}.release|64.ActiveCfg = release 64|x64
-		{0D98F755-794D-704B-0242-6A226EF6664F}.release|64.Build.0 = release 64|x64
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.debug|32.ActiveCfg = debug 32|Win32
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.debug|32.Build.0 = debug 32|Win32
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.debug|64.ActiveCfg = debug 64|x64
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.debug|64.Build.0 = debug 64|x64
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.release|32.ActiveCfg = release 32|Win32
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.release|32.Build.0 = release 32|Win32
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.release|64.ActiveCfg = release 64|x64
-		{0E98F755-7A4D-704B-0342-6A226FF6664F}.release|64.Build.0 = release 64|x64
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.debug|32.ActiveCfg = debug 32|Win32
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.debug|32.Build.0 = debug 32|Win32
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.debug|64.ActiveCfg = debug 64|x64
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.debug|64.Build.0 = debug 64|x64
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.release|32.ActiveCfg = release 32|Win32
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.release|32.Build.0 = release 32|Win32
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.release|64.ActiveCfg = release 64|x64
-		{0F98F755-7B4D-704B-0442-6A2270F6664F}.release|64.Build.0 = release 64|x64
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.debug|32.ActiveCfg = debug 32|Win32
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.debug|32.Build.0 = debug 32|Win32
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.debug|64.ActiveCfg = debug 64|x64
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.debug|64.Build.0 = debug 64|x64
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.release|32.ActiveCfg = release 32|Win32
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.release|32.Build.0 = release 32|Win32
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.release|64.ActiveCfg = release 64|x64
-		{1098F755-7C4D-704B-0542-6A2271F6664F}.release|64.Build.0 = release 64|x64
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.debug|32.ActiveCfg = debug 32|Win32
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.debug|32.Build.0 = debug 32|Win32
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.debug|64.ActiveCfg = debug 64|x64
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.debug|64.Build.0 = debug 64|x64
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.release|32.ActiveCfg = release 32|Win32
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.release|32.Build.0 = release 32|Win32
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.release|64.ActiveCfg = release 64|x64
-		{8DE2A0FD-79B0-9403-6244-052A4EB17068}.release|64.Build.0 = release 64|x64
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|32.ActiveCfg = debug 32|Win32
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|32.Build.0 = debug 32|Win32
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|64.ActiveCfg = debug 64|x64
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|64.Build.0 = debug 64|x64
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|32.ActiveCfg = release 32|Win32
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|32.Build.0 = release 32|Win32
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|64.ActiveCfg = release 64|x64
-		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|64.Build.0 = release 64|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|32.ActiveCfg = debug 32|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|32.Build.0 = debug 32|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|64.ActiveCfg = debug 64|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|64.Build.0 = debug 64|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|32.ActiveCfg = release 32|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|32.Build.0 = release 32|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|64.ActiveCfg = release 64|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|64.Build.0 = release 64|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|32.ActiveCfg = debug 32|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|32.Build.0 = debug 32|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|64.ActiveCfg = debug 64|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|64.Build.0 = debug 64|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|32.ActiveCfg = release 32|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|32.Build.0 = release 32|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|64.ActiveCfg = release 64|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|64.Build.0 = release 64|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|32.ActiveCfg = debug 32|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|32.Build.0 = debug 32|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|64.ActiveCfg = debug 64|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|64.Build.0 = debug 64|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|32.ActiveCfg = release 32|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|32.Build.0 = release 32|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|64.ActiveCfg = release 64|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|64.Build.0 = release 64|x64
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|32.ActiveCfg = debug 32|Win32
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|32.Build.0 = debug 32|Win32
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|64.ActiveCfg = debug 64|x64
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|64.Build.0 = debug 64|x64
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|32.ActiveCfg = release 32|Win32
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|32.Build.0 = release 32|Win32
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|64.ActiveCfg = release 64|x64
-		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|64.Build.0 = release 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.ActiveCfg = debug 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.Build.0 = debug 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.ActiveCfg = debug 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.Build.0 = debug 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.ActiveCfg = release 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.Build.0 = release 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.ActiveCfg = release 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.Build.0 = release 64|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|32.ActiveCfg = debug 32|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|32.Build.0 = debug 32|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|64.ActiveCfg = debug 64|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|64.Build.0 = debug 64|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.release|32.ActiveCfg = release 32|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.release|32.Build.0 = release 32|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.release|64.ActiveCfg = release 64|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.release|64.Build.0 = release 64|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|32.ActiveCfg = debug 32|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|32.Build.0 = debug 32|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|64.ActiveCfg = debug 64|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|64.Build.0 = debug 64|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|32.ActiveCfg = release 32|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|32.Build.0 = release 32|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|64.ActiveCfg = release 64|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|64.Build.0 = release 64|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|32.ActiveCfg = debug 32|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|32.Build.0 = debug 32|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|64.ActiveCfg = debug 64|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|64.Build.0 = debug 64|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|32.ActiveCfg = release 32|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|32.Build.0 = release 32|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|64.ActiveCfg = release 64|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|64.Build.0 = release 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.ActiveCfg = debug 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.Build.0 = debug 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.ActiveCfg = debug 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.Build.0 = debug 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.ActiveCfg = release 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.Build.0 = release 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.ActiveCfg = release 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.Build.0 = release 64|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|x64.Build.0 = Release|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|x64.Build.0 = Release|x64
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F4F0D850-E000-8521-49BA-E93F35E973BA}.Release|x64.Build.0 = Release|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|x64.Build.0 = Release|x64
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Debug|Win32.Build.0 = Debug|Win32
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Debug|x64.ActiveCfg = Debug|x64
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Debug|x64.Build.0 = Debug|x64
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Release|Win32.ActiveCfg = Release|Win32
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Release|Win32.Build.0 = Release|Win32
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Release|x64.ActiveCfg = Release|x64
+		{52CDA049-BEE5-8773-8792-170DF3691C0D}.Release|x64.Build.0 = Release|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|x64.Build.0 = Release|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|x64.Build.0 = Release|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|x64.Build.0 = Release|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|x64.Build.0 = Release|x64
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|Win32.Build.0 = Debug|Win32
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|x64.ActiveCfg = Debug|x64
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|x64.Build.0 = Debug|x64
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|Win32.ActiveCfg = Release|Win32
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|Win32.Build.0 = Release|Win32
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|x64.ActiveCfg = Release|x64
+		{B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|x64.Build.0 = Release|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|x64.Build.0 = Release|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|x64.Build.0 = Release|x64
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|x64.Build.0 = Release|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|x64.Build.0 = Release|x64
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|Win32.Build.0 = Debug|Win32
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|x64.ActiveCfg = Debug|x64
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|x64.Build.0 = Debug|x64
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|Win32.ActiveCfg = Release|Win32
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|Win32.Build.0 = Release|Win32
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|x64.ActiveCfg = Release|x64
+		{6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|x64.Build.0 = Release|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|x64.Build.0 = Debug|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|Win32.Build.0 = Release|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|x64.ActiveCfg = Release|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|x64.Build.0 = Release|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|x64.Build.0 = Debug|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|Win32.Build.0 = Release|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|x64.ActiveCfg = Release|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|x64.Build.0 = Release|x64
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Debug|x64.Build.0 = Debug|x64
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Release|Win32.Build.0 = Release|Win32
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Release|x64.ActiveCfg = Release|x64
+		{83C649A8-EF86-C5DE-B8C1-0E5C24410ABB}.Release|x64.Build.0 = Release|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|x64.Build.0 = Debug|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|Win32.Build.0 = Release|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|x64.ActiveCfg = Release|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|x64.Build.0 = Release|x64
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Debug|Win32.Build.0 = Debug|Win32
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Debug|x64.ActiveCfg = Debug|x64
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Debug|x64.Build.0 = Debug|x64
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Release|Win32.ActiveCfg = Release|Win32
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Release|Win32.Build.0 = Release|Win32
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Release|x64.ActiveCfg = Release|x64
+		{81EC2B20-6DE5-4A72-9617-30F7826F2A7E}.Release|x64.Build.0 = Release|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|x64.Build.0 = Debug|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|Win32.Build.0 = Release|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|x64.ActiveCfg = Release|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|x64.Build.0 = Release|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|x64.Build.0 = Debug|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|Win32.Build.0 = Release|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|x64.ActiveCfg = Release|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|x64.Build.0 = Release|x64
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|x64.Build.0 = Debug|x64
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|Win32.Build.0 = Release|Win32
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|x64.ActiveCfg = Release|x64
+		{CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|x64.Build.0 = Release|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|x64.Build.0 = Debug|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|Win32.Build.0 = Release|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|x64.ActiveCfg = Release|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|x64.Build.0 = Release|x64
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|Win32.Build.0 = Debug|Win32
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|x64.ActiveCfg = Debug|x64
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|x64.Build.0 = Debug|x64
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|Win32.ActiveCfg = Release|Win32
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|Win32.Build.0 = Release|Win32
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|x64.ActiveCfg = Release|x64
+		{4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|x64.Build.0 = Release|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Win32.Build.0 = Debug|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|x64.ActiveCfg = Debug|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|x64.Build.0 = Debug|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Win32.ActiveCfg = Release|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Win32.Build.0 = Release|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|x64.ActiveCfg = Release|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|x64.Build.0 = Release|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|Win32.Build.0 = Debug|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|x64.ActiveCfg = Debug|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|x64.Build.0 = Debug|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|Win32.ActiveCfg = Release|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|Win32.Build.0 = Release|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|x64.ActiveCfg = Release|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|x64.Build.0 = Release|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|Win32.Build.0 = Debug|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|x64.ActiveCfg = Debug|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|x64.Build.0 = Debug|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|Win32.ActiveCfg = Release|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|Win32.Build.0 = Release|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|x64.ActiveCfg = Release|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|x64.Build.0 = Release|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|Win32.Build.0 = Debug|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|x64.ActiveCfg = Debug|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|x64.Build.0 = Debug|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|Win32.ActiveCfg = Release|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|Win32.Build.0 = Release|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|x64.ActiveCfg = Release|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|x64.Build.0 = Release|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Win32.Build.0 = Debug|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|x64.ActiveCfg = Debug|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|x64.Build.0 = Debug|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Win32.ActiveCfg = Release|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Win32.Build.0 = Release|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|x64.ActiveCfg = Release|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|x64.Build.0 = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.Build.0 = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.Build.0 = Release|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.ActiveCfg = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.Build.0 = Release|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|x64.Build.0 = Debug|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|Win32.Build.0 = Release|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|x64.ActiveCfg = Release|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|x64.Build.0 = Release|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|x64.Build.0 = Debug|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|Win32.Build.0 = Release|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|x64.ActiveCfg = Release|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|x64.Build.0 = Release|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|x64.Build.0 = Debug|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|Win32.Build.0 = Release|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|x64.ActiveCfg = Release|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|x64.Build.0 = Release|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.Build.0 = Debug|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.ActiveCfg = Debug|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.Build.0 = Debug|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.ActiveCfg = Release|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.Build.0 = Release|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.ActiveCfg = Release|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/projects/premake/hfsm2-lite.sln b/projects/premake/hfsm2-lite.sln
index 1bb2eb5..2c7de9c 100644
--- a/projects/premake/hfsm2-lite.sln
+++ b/projects/premake/hfsm2-lite.sln
@@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-14", "temp-14.vcxproj", "{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-clang", "temp-clang.vcxproj", "{2DF246B5-19AA-8802-82B1-615E6E8823F3}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-14", "test-14.vcxproj", "{37901DD9-A36F-9C74-AC87-274B18E602D6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-clang", "test-clang.vcxproj", "{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}"
@@ -11,49 +15,64 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "tools", "tools.pyproj", "{2
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		debug|32 = debug|32
-		debug|64 = debug|64
-		debug|Any CPU = debug|Any CPU
-		release|32 = release|32
-		release|64 = release|64
-		release|Any CPU = release|Any CPU
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.ActiveCfg = debug 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.Build.0 = debug 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.ActiveCfg = debug 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.Build.0 = debug 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|Any CPU.ActiveCfg = debug 32|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|Any CPU.Build.0 = debug 32|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.ActiveCfg = release 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.Build.0 = release 32|Win32
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.ActiveCfg = release 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.Build.0 = release 64|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|Any CPU.ActiveCfg = release 32|x64
-		{37901DD9-A36F-9C74-AC87-274B18E602D6}.release|Any CPU.Build.0 = release 32|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.ActiveCfg = debug 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.Build.0 = debug 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.ActiveCfg = debug 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.Build.0 = debug 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|Any CPU.ActiveCfg = debug 32|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|Any CPU.Build.0 = debug 32|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.ActiveCfg = release 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.Build.0 = release 32|Win32
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.ActiveCfg = release 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.Build.0 = release 64|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|Any CPU.ActiveCfg = release 32|x64
-		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|Any CPU.Build.0 = release 32|x64
-		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.debug|32.ActiveCfg = Debug|Any CPU
-		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.debug|64.ActiveCfg = Debug|Any CPU
-		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.release|32.ActiveCfg = Release|Any CPU
-		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.release|64.ActiveCfg = Release|Any CPU
-		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Win32.Build.0 = Debug|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|x64.ActiveCfg = Debug|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|x64.Build.0 = Debug|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Any CPU.ActiveCfg = Release|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Win32.ActiveCfg = Release|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Win32.Build.0 = Release|Win32
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|x64.ActiveCfg = Release|x64
+		{ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|x64.Build.0 = Release|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Win32.Build.0 = Debug|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|x64.ActiveCfg = Debug|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|x64.Build.0 = Debug|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Any CPU.ActiveCfg = Release|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Win32.ActiveCfg = Release|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Win32.Build.0 = Release|Win32
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|x64.ActiveCfg = Release|x64
+		{2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|x64.Build.0 = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Any CPU.Build.0 = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.Build.0 = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Any CPU.ActiveCfg = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Any CPU.Build.0 = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.Build.0 = Release|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.ActiveCfg = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.Build.0 = Release|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.Build.0 = Debug|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.ActiveCfg = Debug|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.Build.0 = Debug|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Any CPU.ActiveCfg = Release|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.ActiveCfg = Release|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.Build.0 = Release|Win32
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.ActiveCfg = Release|x64
+		{77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.Build.0 = Release|x64
+		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Release|Win32.ActiveCfg = Release|Any CPU
+		{2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Release|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5FB237B4-D908-4F4D-8FF9-792682CE9CF4}
-	EndGlobalSection
 EndGlobal
diff --git a/projects/premake/hfsm2-vs.sln b/projects/premake/hfsm2-vs.sln
new file mode 100644
index 0000000..9f5f9c7
--- /dev/null
+++ b/projects/premake/hfsm2-vs.sln
@@ -0,0 +1,188 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34330.188
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-15", "advanced_event_handling-15.vcxproj", "{F3F0D850-DF00-8521-48BA-E93F34E973BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-17", "advanced_event_handling-17.vcxproj", "{F5F0D850-E100-8521-4ABA-E93F36E973BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-15", "basic_audio_player-15.vcxproj", "{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-16", "basic_audio_player-16.vcxproj", "{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-17", "basic_audio_player-17.vcxproj", "{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-15", "basic_traffic_light-15.vcxproj", "{8FF02841-7BEA-5193-6457-E8A350F0B7FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-17", "basic_traffic_light-17.vcxproj", "{91F02841-7DEA-5193-6657-E8A352F0B7FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-15", "calculator-15.vcxproj", "{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-17", "calculator-17.vcxproj", "{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-15", "debug_logger_interface-15.vcxproj", "{CE91E21A-3A54-16A5-8304-A531EF05EF82}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-17", "debug_logger_interface-17.vcxproj", "{D091E21A-3C54-16A5-8504-A531F105EF82}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-15", "temp-15.vcxproj", "{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-16", "temp-16.vcxproj", "{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-17", "temp-17.vcxproj", "{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-15", "test-15.vcxproj", "{38901DD9-A46F-9C74-AD87-274B19E602D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-16", "test-16.vcxproj", "{39901DD9-A56F-9C74-AE87-274B1AE602D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-17", "test-17.vcxproj", "{3A901DD9-A66F-9C74-AF87-274B1BE602D6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|32 = Debug|32
+		Debug|64 = Debug|64
+		Release|32 = Release|32
+		Release|64 = Release|64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|32.ActiveCfg = Debug|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|32.Build.0 = Debug|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|64.ActiveCfg = Debug|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|64.Build.0 = Debug|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|32.ActiveCfg = Release|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|32.Build.0 = Release|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|64.ActiveCfg = Release|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|64.Build.0 = Release|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|32.ActiveCfg = Debug|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|32.Build.0 = Debug|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|64.ActiveCfg = Debug|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|64.Build.0 = Debug|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|32.ActiveCfg = Release|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|32.Build.0 = Release|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|64.ActiveCfg = Release|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|64.Build.0 = Release|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|32.ActiveCfg = Debug|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|32.Build.0 = Debug|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|64.ActiveCfg = Debug|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|64.Build.0 = Debug|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|32.ActiveCfg = Release|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|32.Build.0 = Release|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|64.ActiveCfg = Release|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|64.Build.0 = Release|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|32.ActiveCfg = Debug|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|32.Build.0 = Debug|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|64.ActiveCfg = Debug|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|64.Build.0 = Debug|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|32.ActiveCfg = Release|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|32.Build.0 = Release|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|64.ActiveCfg = Release|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|64.Build.0 = Release|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|32.ActiveCfg = Debug|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|32.Build.0 = Debug|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|64.ActiveCfg = Debug|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|64.Build.0 = Debug|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|32.ActiveCfg = Release|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|32.Build.0 = Release|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|64.ActiveCfg = Release|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|64.Build.0 = Release|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|32.ActiveCfg = Debug|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|32.Build.0 = Debug|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|64.ActiveCfg = Debug|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|64.Build.0 = Debug|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|32.ActiveCfg = Release|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|32.Build.0 = Release|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|64.ActiveCfg = Release|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|64.Build.0 = Release|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|32.ActiveCfg = Debug|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|32.Build.0 = Debug|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|64.ActiveCfg = Debug|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|64.Build.0 = Debug|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|32.ActiveCfg = Release|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|32.Build.0 = Release|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|64.ActiveCfg = Release|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|64.Build.0 = Release|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|32.ActiveCfg = Debug|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|32.Build.0 = Debug|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|64.ActiveCfg = Debug|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|64.Build.0 = Debug|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|32.ActiveCfg = Release|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|32.Build.0 = Release|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|64.ActiveCfg = Release|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|64.Build.0 = Release|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|32.ActiveCfg = Debug|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|32.Build.0 = Debug|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|64.ActiveCfg = Debug|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|64.Build.0 = Debug|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|32.ActiveCfg = Release|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|32.Build.0 = Release|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|64.ActiveCfg = Release|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|64.Build.0 = Release|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|32.ActiveCfg = Debug|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|32.Build.0 = Debug|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|64.ActiveCfg = Debug|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|64.Build.0 = Debug|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|32.ActiveCfg = Release|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|32.Build.0 = Release|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|64.ActiveCfg = Release|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|64.Build.0 = Release|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|32.ActiveCfg = Debug|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|32.Build.0 = Debug|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|64.ActiveCfg = Debug|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|64.Build.0 = Debug|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|32.ActiveCfg = Release|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|32.Build.0 = Release|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|64.ActiveCfg = Release|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|64.Build.0 = Release|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|32.ActiveCfg = Debug|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|32.Build.0 = Debug|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|64.ActiveCfg = Debug|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|64.Build.0 = Debug|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|32.ActiveCfg = Release|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|32.Build.0 = Release|Win32
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|64.ActiveCfg = Release|x64
+		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|64.Build.0 = Release|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|32.ActiveCfg = Debug|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|32.Build.0 = Debug|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|64.ActiveCfg = Debug|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|64.Build.0 = Debug|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|32.ActiveCfg = Release|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|32.Build.0 = Release|Win32
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|64.ActiveCfg = Release|x64
+		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|64.Build.0 = Release|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|32.ActiveCfg = Debug|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|32.Build.0 = Debug|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|64.ActiveCfg = Debug|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|64.Build.0 = Debug|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|32.ActiveCfg = Release|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|32.Build.0 = Release|Win32
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|64.ActiveCfg = Release|x64
+		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|64.Build.0 = Release|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|32.ActiveCfg = Debug|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|32.Build.0 = Debug|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|64.ActiveCfg = Debug|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|64.Build.0 = Debug|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|32.ActiveCfg = Release|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|32.Build.0 = Release|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|64.ActiveCfg = Release|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|64.Build.0 = Release|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|32.ActiveCfg = Debug|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|32.Build.0 = Debug|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|64.ActiveCfg = Debug|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|64.Build.0 = Debug|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|32.ActiveCfg = Release|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|32.Build.0 = Release|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|64.ActiveCfg = Release|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|64.Build.0 = Release|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|32.ActiveCfg = Debug|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|32.Build.0 = Debug|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|64.ActiveCfg = Debug|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|64.Build.0 = Debug|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|32.ActiveCfg = Release|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|32.Build.0 = Release|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|64.ActiveCfg = Release|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/projects/premake/snippets-14.vcxproj b/projects/premake/snippets-14.vcxproj
index 5fa8d25..bb1fa71 100644
--- a/projects/premake/snippets-14.vcxproj
+++ b/projects/premake/snippets-14.vcxproj
@@ -200,84 +200,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/projects/premake/snippets-14.vcxproj.filters b/projects/premake/snippets-14.vcxproj.filters
index 71a143f..9c354fa 100644
--- a/projects/premake/snippets-14.vcxproj.filters
+++ b/projects/premake/snippets-14.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\snippets\wiki_utility-theory.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/snippets-15.vcxproj b/projects/premake/snippets-15.vcxproj
index cbd0c19..7b6c97b 100644
--- a/projects/premake/snippets-15.vcxproj
+++ b/projects/premake/snippets-15.vcxproj
@@ -204,84 +204,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/projects/premake/snippets-15.vcxproj.filters b/projects/premake/snippets-15.vcxproj.filters
index 71a143f..9c354fa 100644
--- a/projects/premake/snippets-15.vcxproj.filters
+++ b/projects/premake/snippets-15.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\snippets\wiki_utility-theory.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/snippets-16.vcxproj b/projects/premake/snippets-16.vcxproj
index eb6f6dc..bb0bf74 100644
--- a/projects/premake/snippets-16.vcxproj
+++ b/projects/premake/snippets-16.vcxproj
@@ -192,84 +192,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/projects/premake/snippets-16.vcxproj.filters b/projects/premake/snippets-16.vcxproj.filters
index 71a143f..9c354fa 100644
--- a/projects/premake/snippets-16.vcxproj.filters
+++ b/projects/premake/snippets-16.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\snippets\wiki_utility-theory.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/snippets-17.vcxproj b/projects/premake/snippets-17.vcxproj
index c02a341..c46a757 100644
--- a/projects/premake/snippets-17.vcxproj
+++ b/projects/premake/snippets-17.vcxproj
@@ -196,84 +196,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/projects/premake/snippets-17.vcxproj.filters b/projects/premake/snippets-17.vcxproj.filters
index 71a143f..9c354fa 100644
--- a/projects/premake/snippets-17.vcxproj.filters
+++ b/projects/premake/snippets-17.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\snippets\wiki_utility-theory.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/snippets-clang.vcxproj b/projects/premake/snippets-clang.vcxproj
index 69eb4eb..bc63e49 100644
--- a/projects/premake/snippets-clang.vcxproj
+++ b/projects/premake/snippets-clang.vcxproj
@@ -200,84 +200,6 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/projects/premake/snippets-clang.vcxproj.filters b/projects/premake/snippets-clang.vcxproj.filters
index 71a143f..9c354fa 100644
--- a/projects/premake/snippets-clang.vcxproj.filters
+++ b/projects/premake/snippets-clang.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\snippets\wiki_utility-theory.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/temp-14.vcxproj b/projects/premake/temp-14.vcxproj
index 048d465..b6447fd 100644
--- a/projects/premake/temp-14.vcxproj
+++ b/projects/premake/temp-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>temp-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -201,82 +185,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\examples\temp\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/premake/temp-14.vcxproj.filters b/projects/premake/temp-14.vcxproj.filters
index 71a143f..e876b98 100644
--- a/projects/premake/temp-14.vcxproj.filters
+++ b/projects/premake/temp-14.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/temp-15.vcxproj b/projects/premake/temp-15.vcxproj
index b1d98e7..0988d0a 100644
--- a/projects/premake/temp-15.vcxproj
+++ b/projects/premake/temp-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>temp-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -205,82 +189,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\examples\temp\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/premake/temp-15.vcxproj.filters b/projects/premake/temp-15.vcxproj.filters
index 71a143f..e876b98 100644
--- a/projects/premake/temp-15.vcxproj.filters
+++ b/projects/premake/temp-15.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/temp-16.vcxproj b/projects/premake/temp-16.vcxproj
index 3d407d5..05ec566 100644
--- a/projects/premake/temp-16.vcxproj
+++ b/projects/premake/temp-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -193,82 +177,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\examples\temp\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/premake/temp-16.vcxproj.filters b/projects/premake/temp-16.vcxproj.filters
index 71a143f..e876b98 100644
--- a/projects/premake/temp-16.vcxproj.filters
+++ b/projects/premake/temp-16.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/temp-17.vcxproj b/projects/premake/temp-17.vcxproj
index 36c68a4..1af8b96 100644
--- a/projects/premake/temp-17.vcxproj
+++ b/projects/premake/temp-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -197,82 +181,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\examples\temp\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/premake/temp-17.vcxproj.filters b/projects/premake/temp-17.vcxproj.filters
index 71a143f..e876b98 100644
--- a/projects/premake/temp-17.vcxproj.filters
+++ b/projects/premake/temp-17.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/temp-clang.vcxproj b/projects/premake/temp-clang.vcxproj
index 2d90530..381cc95 100644
--- a/projects/premake/temp-clang.vcxproj
+++ b/projects/premake/temp-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -201,82 +185,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp" />
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl" />
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\examples\temp\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/projects/premake/temp-clang.vcxproj.filters b/projects/premake/temp-clang.vcxproj.filters
index 71a143f..e876b98 100644
--- a/projects/premake/temp-clang.vcxproj.filters
+++ b/projects/premake/temp-clang.vcxproj.filters
@@ -1,251 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="detail">
-      <UniqueIdentifier>{18D587F8-0477-B2CE-ED31-C622D972391F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\containers">
-      <UniqueIdentifier>{BD5C5527-2973-53BD-72EA-DEDEDE3F2445}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\features">
-      <UniqueIdentifier>{4633AC7A-B2BE-193F-BBCF-9C3327DA753F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\root">
-      <UniqueIdentifier>{EBAD437B-5763-BC70-E057-B6474C0CB374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\shared">
-      <UniqueIdentifier>{5EA9B55C-CA69-3193-93A4-7A10FF23766F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="detail\structure">
-      <UniqueIdentifier>{B8A70EB0-A4A0-2D02-CDD2-1287B92A0D0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\development\hfsm2\detail\config.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.hpp">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\containers\bit_array.inl">
-      <Filter>detail\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\logger_interface.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\structure_report.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\task_list.inl">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\features\transition.hpp">
-      <Filter>detail\features</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_3.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_4.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\control_5.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\core.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_0.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\plan_data.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry.hpp">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_1.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root\registry_2.inl">
-      <Filter>detail\root</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_0.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_1.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_2.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_3.inl">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\root_4.hpp">
-      <Filter>detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\bit_stream.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\iterator.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_off.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\macros_on.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\random.inl">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\type_list.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\shared\utility.hpp">
-      <Filter>detail\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\ancestors_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\base.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\composite_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\forward.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\orthogonal_sub_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_1.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.hpp">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\detail\structure\state_2.inl">
-      <Filter>detail\structure</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
+    <ClCompile Include="..\..\examples\temp\main.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/premake/test-14.vcxproj b/projects/premake/test-14.vcxproj
index bd74efd..64b47f0 100644
--- a/projects/premake/test-14.vcxproj
+++ b/projects/premake/test-14.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>test-14</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-14\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-14\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -141,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -158,7 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -179,7 +163,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -279,6 +263,7 @@
     <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
     <ClInclude Include="..\..\test\tools.hpp" />
     <ClInclude Include="..\..\test\tools.inl" />
+    <ClInclude Include="..\..\test\wiki_class_member.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp" />
@@ -314,9 +299,10 @@
     <ClCompile Include="..\..\test\test_stress.cpp" />
     <ClCompile Include="..\..\test\test_utility_regions.cpp" />
     <ClCompile Include="..\..\test\test_utilize.cpp" />
+    <ClCompile Include="..\..\test\wiki_class_member.cpp" />
     <ClCompile Include="..\..\test\wiki_plans.cpp" />
     <ClCompile Include="..\..\test\wiki_serialization.cpp" />
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp" />
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp" />
     <ClCompile Include="..\..\test\wiki_tutorial.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/premake/test-14.vcxproj.filters b/projects/premake/test-14.vcxproj.filters
index ee5e1dd..a9e248b 100644
--- a/projects/premake/test-14.vcxproj.filters
+++ b/projects/premake/test-14.vcxproj.filters
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\test\tools.inl">
       <Filter>test</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\test\wiki_class_member.hpp">
+      <Filter>test</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp">
@@ -371,13 +374,16 @@
     <ClCompile Include="..\..\test\test_utilize.cpp">
       <Filter>test</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\wiki_class_member.cpp">
+      <Filter>test</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\test\wiki_plans.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_serialization.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp">
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_tutorial.cpp">
diff --git a/projects/premake/test-15.vcxproj b/projects/premake/test-15.vcxproj
index eee5b58..64f6fd5 100644
--- a/projects/premake/test-15.vcxproj
+++ b/projects/premake/test-15.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -41,39 +25,39 @@
     <RootNamespace>test-15</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Globals">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Globals">
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -83,48 +67,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-15\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-15\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -142,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -160,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -182,7 +166,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -283,6 +267,7 @@
     <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
     <ClInclude Include="..\..\test\tools.hpp" />
     <ClInclude Include="..\..\test\tools.inl" />
+    <ClInclude Include="..\..\test\wiki_class_member.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp" />
@@ -318,9 +303,10 @@
     <ClCompile Include="..\..\test\test_stress.cpp" />
     <ClCompile Include="..\..\test\test_utility_regions.cpp" />
     <ClCompile Include="..\..\test\test_utilize.cpp" />
+    <ClCompile Include="..\..\test\wiki_class_member.cpp" />
     <ClCompile Include="..\..\test\wiki_plans.cpp" />
     <ClCompile Include="..\..\test\wiki_serialization.cpp" />
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp" />
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp" />
     <ClCompile Include="..\..\test\wiki_tutorial.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/premake/test-15.vcxproj.filters b/projects/premake/test-15.vcxproj.filters
index ee5e1dd..a9e248b 100644
--- a/projects/premake/test-15.vcxproj.filters
+++ b/projects/premake/test-15.vcxproj.filters
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\test\tools.inl">
       <Filter>test</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\test\wiki_class_member.hpp">
+      <Filter>test</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp">
@@ -371,13 +374,16 @@
     <ClCompile Include="..\..\test\test_utilize.cpp">
       <Filter>test</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\wiki_class_member.cpp">
+      <Filter>test</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\test\wiki_plans.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_serialization.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp">
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_tutorial.cpp">
diff --git a/projects/premake/test-16.vcxproj b/projects/premake/test-16.vcxproj
index fcc9eec..e592909 100644
--- a/projects/premake/test-16.vcxproj
+++ b/projects/premake/test-16.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-16\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-16\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -130,7 +114,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -148,7 +132,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -170,7 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -271,6 +255,7 @@
     <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
     <ClInclude Include="..\..\test\tools.hpp" />
     <ClInclude Include="..\..\test\tools.inl" />
+    <ClInclude Include="..\..\test\wiki_class_member.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp" />
@@ -306,9 +291,10 @@
     <ClCompile Include="..\..\test\test_stress.cpp" />
     <ClCompile Include="..\..\test\test_utility_regions.cpp" />
     <ClCompile Include="..\..\test\test_utilize.cpp" />
+    <ClCompile Include="..\..\test\wiki_class_member.cpp" />
     <ClCompile Include="..\..\test\wiki_plans.cpp" />
     <ClCompile Include="..\..\test\wiki_serialization.cpp" />
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp" />
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp" />
     <ClCompile Include="..\..\test\wiki_tutorial.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/premake/test-16.vcxproj.filters b/projects/premake/test-16.vcxproj.filters
index ee5e1dd..a9e248b 100644
--- a/projects/premake/test-16.vcxproj.filters
+++ b/projects/premake/test-16.vcxproj.filters
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\test\tools.inl">
       <Filter>test</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\test\wiki_class_member.hpp">
+      <Filter>test</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp">
@@ -371,13 +374,16 @@
     <ClCompile Include="..\..\test\test_utilize.cpp">
       <Filter>test</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\wiki_class_member.cpp">
+      <Filter>test</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\test\wiki_plans.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_serialization.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp">
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_tutorial.cpp">
diff --git a/projects/premake/test-17.vcxproj b/projects/premake/test-17.vcxproj
index 545f5fd..b1966c4 100644
--- a/projects/premake/test-17.vcxproj
+++ b/projects/premake/test-17.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-17\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-17\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -131,7 +115,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -150,7 +134,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -173,7 +157,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -275,6 +259,7 @@
     <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
     <ClInclude Include="..\..\test\tools.hpp" />
     <ClInclude Include="..\..\test\tools.inl" />
+    <ClInclude Include="..\..\test\wiki_class_member.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp" />
@@ -310,9 +295,10 @@
     <ClCompile Include="..\..\test\test_stress.cpp" />
     <ClCompile Include="..\..\test\test_utility_regions.cpp" />
     <ClCompile Include="..\..\test\test_utilize.cpp" />
+    <ClCompile Include="..\..\test\wiki_class_member.cpp" />
     <ClCompile Include="..\..\test\wiki_plans.cpp" />
     <ClCompile Include="..\..\test\wiki_serialization.cpp" />
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp" />
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp" />
     <ClCompile Include="..\..\test\wiki_tutorial.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/premake/test-17.vcxproj.filters b/projects/premake/test-17.vcxproj.filters
index ee5e1dd..a9e248b 100644
--- a/projects/premake/test-17.vcxproj.filters
+++ b/projects/premake/test-17.vcxproj.filters
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\test\tools.inl">
       <Filter>test</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\test\wiki_class_member.hpp">
+      <Filter>test</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp">
@@ -371,13 +374,16 @@
     <ClCompile Include="..\..\test\test_utilize.cpp">
       <Filter>test</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\wiki_class_member.cpp">
+      <Filter>test</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\test\wiki_plans.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_serialization.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp">
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_tutorial.cpp">
diff --git a/projects/premake/test-clang.vcxproj b/projects/premake/test-clang.vcxproj
index 3b25b59..9f23bbd 100644
--- a/projects/premake/test-clang.vcxproj
+++ b/projects/premake/test-clang.vcxproj
@@ -1,36 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug 32|Win32">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 32|x64">
-      <Configuration>debug 32</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|Win32">
-      <Configuration>debug 64</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="debug 64|x64">
-      <Configuration>debug 64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|Win32">
-      <Configuration>release 32</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 32|x64">
-      <Configuration>release 32</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|Win32">
-      <Configuration>release 64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release 64|x64">
-      <Configuration>release 64</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -42,26 +26,26 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>clangcl</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
@@ -71,48 +55,48 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <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 32|Win32'">
+  <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\binaries-$(PlatformArchitecture)\</OutDir>
-    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-clang\</IntDir>
+    <OutDir>..\..\binaries\</OutDir>
+    <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-clang\</IntDir>
     <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -132,7 +116,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -152,7 +136,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 32|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -176,7 +160,7 @@
       <AdditionalOptions>/INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release 64|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -279,6 +263,7 @@
     <ClInclude Include="..\..\development\hfsm2\machine_dev.hpp" />
     <ClInclude Include="..\..\test\tools.hpp" />
     <ClInclude Include="..\..\test\tools.inl" />
+    <ClInclude Include="..\..\test\wiki_class_member.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp" />
@@ -314,9 +299,10 @@
     <ClCompile Include="..\..\test\test_stress.cpp" />
     <ClCompile Include="..\..\test\test_utility_regions.cpp" />
     <ClCompile Include="..\..\test\test_utilize.cpp" />
+    <ClCompile Include="..\..\test\wiki_class_member.cpp" />
     <ClCompile Include="..\..\test\wiki_plans.cpp" />
     <ClCompile Include="..\..\test\wiki_serialization.cpp" />
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp" />
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp" />
     <ClCompile Include="..\..\test\wiki_tutorial.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projects/premake/test-clang.vcxproj.filters b/projects/premake/test-clang.vcxproj.filters
index ee5e1dd..a9e248b 100644
--- a/projects/premake/test-clang.vcxproj.filters
+++ b/projects/premake/test-clang.vcxproj.filters
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\test\tools.inl">
       <Filter>test</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\test\wiki_class_member.hpp">
+      <Filter>test</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main.cpp">
@@ -371,13 +374,16 @@
     <ClCompile Include="..\..\test\test_utilize.cpp">
       <Filter>test</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\wiki_class_member.cpp">
+      <Filter>test</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\test\wiki_plans.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_serialization.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\wiki_transitions-within-hierarchy.cpp">
+    <ClCompile Include="..\..\test\wiki_transitions_within_hierarchy.cpp">
       <Filter>test</Filter>
     </ClCompile>
     <ClCompile Include="..\..\test\wiki_tutorial.cpp">
diff --git a/test/reported/issue_49.cpp b/test/reported/issue_49.cpp
index e73216c..8de07cd 100644
--- a/test/reported/issue_49.cpp
+++ b/test/reported/issue_49.cpp
@@ -32,12 +32,12 @@ struct Disable {};
 
 struct Disabled : FSM::State
 {
-	void update(FullControl& control) noexcept
+	void update(FullControl& control)
 	{
 		control.changeTo<Enabled>();
 	}
 
-	void react(const Enable&, FullControl& control) noexcept
+	void react(const Enable&, FullControl& control)
 	{
 		control.changeTo<Enabled>();
 	}
@@ -47,7 +47,7 @@ struct Disabled : FSM::State
 
 struct Enabled : FSM::State
 {
-	void react(const Disable&, FullControl& control) noexcept
+	void react(const Disable&, FullControl& control)
 	{
 		control.changeTo<Disabled>();
 	}
@@ -65,7 +65,7 @@ struct Active : FSM::State
 
 struct Idle : FSM::State
 {
-	void update(FullControl& control) noexcept
+	void update(FullControl& control)
 	{
 		control.changeTo<Active>();
 	}
@@ -73,7 +73,7 @@ struct Idle : FSM::State
 
 struct A : FSM::State
 {
-	void enter(PlanControl& control) noexcept
+	void enter(PlanControl& control)
 	{
 		auto plan = control.plan();
 
@@ -82,22 +82,22 @@ struct A : FSM::State
 		plan.change<C, D>();
 	}
 
-	void update(FullControl& control) noexcept { control.succeed(); }
+	void update(FullControl& control) { control.succeed(); }
 };
 
 struct B : FSM::State
 {
-	void update(FullControl& control) noexcept { control.succeed(); }
+	void update(FullControl& control) { control.succeed(); }
 };
 
 struct C : FSM::State
 {
-	void update(FullControl& control) noexcept { control.succeed(); }
+	void update(FullControl& control) { control.succeed(); }
 };
 
 struct D : FSM::State
 {
-	void update(FullControl& control) noexcept { control.succeed(); }
+	void update(FullControl& control) { control.succeed(); }
 };
 
 TEST_CASE("FSM.Reported.issue_49")
diff --git a/test/test_ancestors.cpp b/test/test_ancestors.cpp
index 61f57ad..06f25f4 100644
--- a/test/test_ancestors.cpp
+++ b/test/test_ancestors.cpp
@@ -32,12 +32,12 @@ struct Event {
 	};
 
 	Event(const hfsm2::StateID origin_,
-		  const Type type_) noexcept
+		  const Type type_)
 		: origin{origin_}
 		, type{type_}
 	{}
 
-	Event(const Type type_ = Type::COUNT) noexcept
+	Event(const Type type_ = Type::COUNT)
 		: type{type_}
 	{}
 
@@ -51,7 +51,7 @@ using Events = std::vector<Event>;
 
 void
 assertSequence(Events& history,
-			   const Events& reference) noexcept
+			   const Events& reference)
 {
 	const auto count = std::max(history.size(), reference.size());
 
diff --git a/test/test_contexts_random.cpp b/test/test_contexts_random.cpp
index ed32a06..7c181aa 100644
--- a/test/test_contexts_random.cpp
+++ b/test/test_contexts_random.cpp
@@ -13,7 +13,7 @@ namespace test_contexts_random {
 using Context = int;
 
 struct DummyRNG {
-	inline float next() noexcept { return 0.0f; }
+	inline float next() { return 0.0f; }
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tools.hpp b/test/tools.hpp
index de691e5..f6a9b59 100644
--- a/test/tools.hpp
+++ b/test/tools.hpp
@@ -79,7 +79,7 @@ struct Event final {
 	Event(const hfsm2::StateID origin_,
 		  const Type type_,
 		  const hfsm2::StateID target_ = hfsm2::INVALID_STATE_ID,
-		  const float utility_ = 0.0f)									noexcept
+		  const float utility_ = 0.0f)
 		: origin{origin_}
 		, type{type_}
 		, target{target_}
@@ -88,7 +88,7 @@ struct Event final {
 
 	Event(const Type type_,
 		  const hfsm2::StateID target_,
-		  const float utility_ = 0.0f)									noexcept
+		  const float utility_ = 0.0f)
 		: origin{hfsm2::INVALID_STATE_ID}
 		, type{type_}
 		, target{target_}
@@ -128,48 +128,48 @@ struct LoggerT final
 
 	void recordMethod(const Context& context,
 					  const StateID origin,
-					  const Method method)					   noexcept override;
+					  const Method method) override;
 
 	void recordTransition(const Context& context,
 						  const StateID origin,
 						  const TransitionType transitionType,
-						  const StateID target)				   noexcept override;
+						  const StateID target) override;
 
 #ifdef HFSM2_ENABLE_PLANS
 
 	void recordTaskStatus(const Context& context,
 						  const RegionID region,
 						  const StateID origin,
-						  const StatusEvent event)			   noexcept override;
+						  const StatusEvent event) override;
 
 	void recordPlanStatus(const Context& context,
 						  const RegionID region,
-						  const StatusEvent event)			   noexcept override;
+						  const StatusEvent event) override;
 
 #endif
 
 	void recordCancelledPending(const Context& context,
-								const StateID origin)		   noexcept override;
+								const StateID origin) override;
 
 	void recordSelectResolution(const Context& context,
 								const StateID head,
-								const Prong prong)			   noexcept override;
+								const Prong prong) override;
 
 #ifdef HFSM2_ENABLE_UTILITY_THEORY
 
 	void recordUtilityResolution(const Context& context,
 								 const StateID head,
 								 const Prong prong,
-								 const Utilty utilty)		   noexcept override;
+								 const Utilty utilty) override;
 
 	void recordRandomResolution(const Context& context,
 								const StateID head,
 								const Prong prong,
-								const Utilty utilty)		   noexcept override;
+								const Utilty utilty) override;
 
 #endif
 
-	void assertSequence(const Events& reference)						noexcept;
+	void assertSequence(const Events& reference);
 
 	Events history;
 };
@@ -182,14 +182,14 @@ using Types = std::vector<hfsm2::StateID>;
 template <typename TMachine>
 void assertActive(TMachine& machine,
 				  const Types& all,
-				  const Types& toCheck)									noexcept;
+				  const Types& toCheck);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 template <typename TMachine>
 void assertResumable(TMachine& machine,
 					 const Types& all,
-					 const Types& toCheck)								noexcept;
+					 const Types& toCheck);
 
 //------------------------------------------------------------------------------
 
@@ -200,7 +200,7 @@ using StructureReference = std::vector<hfsm2::StructureEntry>;
 template <typename TStructure>
 void
 assertStructure(const TStructure& structure,
-				const StructureReference& reference)			noexcept;
+				const StructureReference& reference);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -209,7 +209,7 @@ using ActivityReference = std::vector<int8_t>;
 template <typename TActivityHistory>
 void
 assertActivity(const TActivityHistory& activity,
-			   const ActivityReference& reference)						noexcept;
+			   const ActivityReference& reference);
 
 #endif
 
@@ -220,7 +220,7 @@ assertActivity(const TActivityHistory& activity,
 template <typename TMachine>
 void assertLastTransitions(TMachine& machine,
 						   const Types& all,
-						   const Types& toCheck)						noexcept;
+						   const Types& toCheck);
 
 #endif
 
diff --git a/test/tools.inl b/test/tools.inl
index b290c7e..6c6b5ef 100644
--- a/test/tools.inl
+++ b/test/tools.inl
@@ -7,7 +7,7 @@ template <typename TConfig>
 void
 LoggerT<TConfig>::recordMethod(const Context& /*context*/,
 							   const StateID origin,
-							   const Method method) noexcept
+							   const Method method)
 {
 	REQUIRE(hfsm2::methodName(method));
 
@@ -101,7 +101,7 @@ void
 LoggerT<TConfig>::recordTransition(const Context& UNUSED(context),
 								   const StateID origin,
 								   const TransitionType transitionType,
-								   const StateID target) noexcept
+								   const StateID target)
 {
 	REQUIRE(hfsm2::transitionName(transitionType));
 
@@ -152,7 +152,7 @@ void
 LoggerT<TConfig>::recordTaskStatus(const Context& UNUSED(context),
 								   const RegionID region,
 								   const StateID origin,
-								   const StatusEvent event) noexcept
+								   const StatusEvent event)
 {
 	switch (event) {
 		case StatusEvent::SUCCEEDED:
@@ -174,7 +174,7 @@ template <typename TConfig>
 void
 LoggerT<TConfig>::recordPlanStatus(const Context& UNUSED(context),
 								   const RegionID region,
-								   const StatusEvent event) noexcept
+								   const StatusEvent event)
 {
 	switch (event) {
 		case StatusEvent::SUCCEEDED:
@@ -197,7 +197,7 @@ LoggerT<TConfig>::recordPlanStatus(const Context& UNUSED(context),
 template <typename TConfig>
 void
 LoggerT<TConfig>::recordCancelledPending(const Context& UNUSED(context),
-										 const StateID origin) noexcept
+										 const StateID origin)
 {
 	history.emplace_back(origin, Event::Type::CANCEL_PENDING);
 }
@@ -208,7 +208,7 @@ template <typename TConfig>
 void
 LoggerT<TConfig>::recordSelectResolution(const Context& UNUSED(context),
 										 const StateID head,
-										 const Prong prong) noexcept
+										 const Prong prong)
 {
 	history.emplace_back(head, Event::Type::SELECT_RESOLUTION, prong);
 }
@@ -222,7 +222,7 @@ void
 LoggerT<TConfig>::recordUtilityResolution(const Context& UNUSED(context),
 										  const StateID head,
 										  const Prong prong,
-										  const Utilty utilty) noexcept
+										  const Utilty utilty)
 {
 	history.emplace_back(head, Event::Type::UTILITY_RESOLUTION, prong, utilty);
 }
@@ -234,7 +234,7 @@ void
 LoggerT<TConfig>::recordRandomResolution(const Context& UNUSED(context),
 										 const StateID head,
 										 const Prong prong,
-										 const Utilty utilty) noexcept
+										 const Utilty utilty)
 {
 	history.emplace_back(head, Event::Type::RANDOM_RESOLUTION, prong, utilty);
 }
@@ -245,7 +245,7 @@ LoggerT<TConfig>::recordRandomResolution(const Context& UNUSED(context),
 
 template <typename TConfig>
 void
-LoggerT<TConfig>::assertSequence(const Events& reference) noexcept {
+LoggerT<TConfig>::assertSequence(const Events& reference) {
 	const auto count = std::max(history.size(), reference.size());
 
 	for (unsigned i = 0; i < count; ++i) {
@@ -270,7 +270,7 @@ template <typename TMachine>
 void
 assertActive(TMachine& machine,
 			 const Types& all,
-			 const Types& toCheck) noexcept
+			 const Types& toCheck)
 {
 	for (const auto& type : all) {
 		if (std::find(toCheck.begin(), toCheck.end(), type) != toCheck.end())
@@ -286,7 +286,7 @@ template <typename TMachine>
 void
 assertResumable(TMachine& machine,
 				const Types& all,
-				const Types& toCheck) noexcept
+				const Types& toCheck)
 {
 	for (const auto& type : all) {
 		if (std::find(toCheck.begin(), toCheck.end(), type) != toCheck.end())
@@ -303,7 +303,7 @@ assertResumable(TMachine& machine,
 template <typename TStructure>
 void
 assertStructure(const TStructure& structure,
-				const StructureReference& reference) noexcept
+				const StructureReference& reference)
 {
 	const std::size_t count = std::max(static_cast<std::size_t>(structure.count()), reference.size());
 
@@ -329,7 +329,7 @@ assertStructure(const TStructure& structure,
 template <typename TActivityHistory>
 void
 assertActivity(const TActivityHistory& activity,
-			   const ActivityReference& reference) noexcept
+			   const ActivityReference& reference)
 {
 	REQUIRE(static_cast<size_t>(activity.count()) == reference.size());
 	const size_t count = std::max(static_cast<size_t>(activity.count()), reference.size());
@@ -356,7 +356,7 @@ template <typename TMachine>
 void
 assertLastTransitions(TMachine& machine,
 					  const Types& all,
-					  const Types& toCheck) noexcept
+					  const Types& toCheck)
 {
 	for (const auto& type : all) {
 		if (std::find(toCheck.begin(), toCheck.end(), type) != toCheck.end())
diff --git a/test/wiki_class_member.cpp b/test/wiki_class_member.cpp
new file mode 100644
index 0000000..4b9052e
--- /dev/null
+++ b/test/wiki_class_member.cpp
@@ -0,0 +1,74 @@
+// HFSM2 (hierarchical state machine for games and interactive applications)
+// Created by Andrew Gresyk
+
+#include "wiki_class_member.hpp"
+
+#include <hfsm2/machine.hpp>
+
+#include <doctest/doctest.h>
+
+////////////////////////////////////////////////////////////////////////////////
+namespace actor_fsm {
+
+//------------------------------------------------------------------------------
+
+using Config = hfsm2::Config
+					::ContextT<Actor&>;
+
+using M = hfsm2::MachineT<Config>;
+
+#define S(s) struct s
+using FSM = M::PeerRoot<
+				S(Off),
+				S(On)
+			>;
+#undef S
+
+struct Off : FSM::State {};
+struct On  : FSM::State {};
+
+FSM::Instance&
+fsm(	  Actor::FsmHost& fsmHost) { return *reinterpret_cast<		FSM::Instance*>(&fsmHost); }
+
+const FSM::Instance&
+fsm(const Actor::FsmHost& fsmHost) { return *reinterpret_cast<const FSM::Instance*>(&fsmHost); }
+
+//------------------------------------------------------------------------------
+
+}
+
+Actor::Actor() {
+	//hfsm2::StaticPrintConstT<alignof(actor_fsm::FSM::Instance)> alignment;
+	static_assert(alignof(actor_fsm::FSM::Instance) <= alignof(FsmHost),
+				  "Uncomment the line above to find out the alignment of the `FsmHost` needed");
+
+	//hfsm2::StaticPrintConstT<sizeof(actor_fsm::FSM::Instance)> size;
+	static_assert(sizeof(actor_fsm::FSM::Instance) <= sizeof(FsmHost),
+				  "Uncomment the line above to find out the size of the `FsmHost` needed");
+
+	new (&_fsmHost) actor_fsm::FSM::Instance{*this};
+}
+
+Actor::~Actor() {
+	hfsm2::destroy(actor_fsm::fsm(_fsmHost));
+}
+
+void Actor::turnOn() {
+	actor_fsm::fsm(_fsmHost).immediateChangeTo<actor_fsm::On>();
+}
+
+bool Actor::isOn() const {
+	return actor_fsm::fsm(_fsmHost).isActive<actor_fsm::On>();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+TEST_CASE("Wiki.Class Member") {
+	Actor actor;
+	REQUIRE(actor.isOn() == false);
+
+	actor.turnOn();
+	REQUIRE(actor.isOn() == true);
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/test/wiki_class_member.hpp b/test/wiki_class_member.hpp
new file mode 100644
index 0000000..5bf9534
--- /dev/null
+++ b/test/wiki_class_member.hpp
@@ -0,0 +1,28 @@
+// HFSM2 (hierarchical state machine for games and interactive applications)
+// Created by Andrew Gresyk
+
+#pragma once
+
+#include <cstddef> // max_align_t
+
+////////////////////////////////////////////////////////////////////////////////
+
+class Actor {
+public:
+	struct alignas(std::max_align_t) FsmHost {
+		char buffer[104]; // the size is hand-adjusted
+	};
+
+public:
+	Actor();
+	~Actor();
+
+	void turnOn();
+
+	bool isOn() const;
+
+private:
+	FsmHost _fsmHost;
+};
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/test/wiki_plans.cpp b/test/wiki_plans.cpp
index abe9b5d..61bfb92 100644
--- a/test/wiki_plans.cpp
+++ b/test/wiki_plans.cpp
@@ -22,7 +22,7 @@ TEST_CASE("Wiki.Plans.Traffic Light") {
     struct Apex
         : FSM::State
     {
-        void enter(PlanControl& control) noexcept {
+        void enter(PlanControl& control) {
             // create an empty plan
             auto plan = control.plan();
 
@@ -40,15 +40,15 @@ TEST_CASE("Wiki.Plans.Traffic Light") {
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     struct Red    : FSM::State {
-        void update(FullControl& control) noexcept { control.succeed(); }
+        void update(FullControl& control) { control.succeed(); }
     };
 
     struct Yellow : FSM::State {
-        void update(FullControl& control) noexcept { control.succeed(); }
+        void update(FullControl& control) { control.succeed(); }
     };
 
     struct Green  : FSM::State {
-        void update(FullControl& control) noexcept { control.succeed(); }
+        void update(FullControl& control) { control.succeed(); }
     };
 
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -102,7 +102,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct PlanOwner
         : FSM::State
     {
-        void enter(PlanControl& control) noexcept {
+        void enter(PlanControl& control) {
             auto plan = control.plan();
 
             // build the plan by sequencing transitions
@@ -122,7 +122,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
         //void planSucceeded(FullControl& control) {}
 
         // respond to plan failure below
-        void planFailed(FullControl& control) noexcept {
+        void planFailed(FullControl& control) {
             control.changeTo<End>();
         }
     };
@@ -130,7 +130,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct StateTask
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             control.succeed();
         }
     };
@@ -142,7 +142,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct CT_Initial
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             // mark the task as successful
             control.changeTo<CT_Following>();
         }
@@ -151,7 +151,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct CT_Following
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             // even though CompositeTask has no plan attached to it,
             // the sub-state can 'succeed' the entire region
             control.succeed();
@@ -167,7 +167,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct OT_2
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             // the task can also be marked successful
             // from its sub-state one level down
             control.succeed();
@@ -179,7 +179,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct ReplanTask
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             // parametrized version of PlanControl::plan() allows access to plans
             // hosted by any region
             auto plan = control.plan<PlanOwner>();
@@ -217,7 +217,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
         : FSM::State
     {
         // guard gets executed before the first sub-state activates implicitly ..
-        void entryGuard(GuardControl& control) noexcept {
+        void entryGuard(GuardControl& control) {
             // .. so the plan can start from the second sub-state
             control.changeTo<SubTask_2>();
 
@@ -228,15 +228,15 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
         // without plan execution reactions, plan results
         // are propagated to the outer plan
         //
-        //void planSucceeded(FullControl& control) noexcept {}
-        //void planFailed(FullControl& control) noexcept {}
+        //void planSucceeded(FullControl& control) {}
+        //void planFailed(FullControl& control) {}
     };
 
     // these appear in the plan in reverse order
     struct SubTask_1
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             // owner region's planFailed() gets called in response to plan failure
             control.fail();
         }
@@ -245,7 +245,7 @@ TEST_CASE("Wiki.Plans.Detailed Demo") {
     struct SubTask_2
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             // continue in reverse order, as defined by the plan in SubPlanOwner
             control.succeed();
         }
diff --git a/test/wiki_transitions-within-hierarchy.cpp b/test/wiki_transitions_within_hierarchy.cpp
similarity index 91%
rename from test/wiki_transitions-within-hierarchy.cpp
rename to test/wiki_transitions_within_hierarchy.cpp
index ca143f6..6304567 100644
--- a/test/wiki_transitions-within-hierarchy.cpp
+++ b/test/wiki_transitions_within_hierarchy.cpp
@@ -85,7 +85,7 @@ TEST_CASE("Wiki.Transitions within Hierarchy.Internal Transition Interface") {
     struct Origin
         : FSM::State
     {
-        void update(FullControl& control) noexcept {
+        void update(FullControl& control) {
             control.changeTo<Destination>(); // internal transition
         }
     };
@@ -177,13 +177,13 @@ TEST_CASE("Wiki.Transitions within Hierarchy.'Utilize' Transition") {
     struct LowRated
         : FSM::State
     {
-        float utility(const Control&) noexcept { return 0.5f; }
+        float utility(const Control&) { return 0.5f; }
     };
 
     struct HighRated
         : FSM::State
     {
-        float utility(const Control&) noexcept { return 2.0f; }
+        float utility(const Control&) { return 2.0f; }
     };
 
     FSM::Instance fsm;
@@ -213,25 +213,25 @@ TEST_CASE("Wiki.Transitions within Hierarchy.'Randomize' Transition") {
     struct FilteredOut
         : FSM::State
     {
-        int8_t rank(const Control&) noexcept { return 0; } // filter out using low rank
+        int8_t rank(const Control&) { return 0; } // filter out using low rank
 
-        float utility(const Control&) noexcept { return 0.5f; }
+        float utility(const Control&) { return 0.5f; }
     };
 
     struct LowRated
         : FSM::State
     {
-        int8_t rank(const Control&) noexcept { return 1; }
+        int8_t rank(const Control&) { return 1; }
 
-        float utility(const Control&) noexcept { return 0.5f; }
+        float utility(const Control&) { return 0.5f; }
     };
 
     struct HighRated
         : FSM::State
     {
-        int8_t rank(const Control&) noexcept { return 1; }
+        int8_t rank(const Control&) { return 1; }
 
-        float utility(const Control&) noexcept { return 2.0f; }
+        float utility(const Control&) { return 2.0f; }
     };
 
     FSM::Instance fsm;
diff --git a/test/wiki_tutorial.cpp b/test/wiki_tutorial.cpp
index 030b961..8d0520c 100644
--- a/test/wiki_tutorial.cpp
+++ b/test/wiki_tutorial.cpp
@@ -54,7 +54,7 @@ struct Event {};
 struct Off
     : FSM::State
 {
-    void entryGuard(FullControl& control) noexcept {           // called before state activation, use to re-route transitions
+    void entryGuard(FullControl& control) {					   // called before state activation, use to re-route transitions
         if (control.context().powerOn)                         // access shared data
             control.changeTo<On>();                            // initiate a transition into 'On' region
     }
@@ -63,7 +63,7 @@ struct Off
 struct On
     : FSM::State
 {
-    void enter(PlanControl& control) noexcept {                // called on state activation
+    void enter(PlanControl& control) {					       // called on state activation
         auto plan = control.plan();                            // access the plan for the region
 
         plan.change<Red, Yellow>();                            // sequence plan steps, executed when the previous state succeeds
@@ -72,19 +72,19 @@ struct On
         plan.change<Yellow, Red>();
     }
 
-    void exit(PlanControl& /*control*/) noexcept {}            // called on state deactivation
+    void exit(PlanControl& /*control*/) {}		               // called on state deactivation
 
-    void planSucceeded(FullControl& control) noexcept {        // called on the successful completion of all plan steps
+    void planSucceeded(FullControl& control) {                 // called on the successful completion of all plan steps
         control.changeTo<Done>();
     }
 
-    void planFailed(FullControl& /*control*/) noexcept {}      // called if any of the plan steps fails
+    void planFailed(FullControl& /*control*/) {}               // called if any of the plan steps fails
 };
 
 struct Red
     : FSM::State
 {
-    void update(FullControl& control) noexcept {               // called on periodic state machine updates
+    void update(FullControl& control) {                        // called on periodic state machine updates
         control.succeed();                                     // notify successful completion of the plan step
     }                                                          // plan will advance to the 'Yellow' state
 };
@@ -92,7 +92,7 @@ struct Red
 struct Yellow
     : FSM::State
 {
-    void update(FullControl& control) noexcept {
+    void update(FullControl& control) {
         control.succeed();                                     // plan will advance to the 'Green' state on the first entry
                                                                // and 'Red' state on the second one
     }
@@ -101,7 +101,7 @@ struct Yellow
 struct Green
     : FSM::State
 {
-    void react(const Event&, FullControl& control) noexcept {  // called on external events
+    void react(const Event&, FullControl& control) {           // called on external events
         control.succeed();                                     // advance to the next plan step
     }
 };