git » swiftpm » commit 3a4f6d3

Use libstrophe with FAST support

Use libstrophe with FAST support

diff --git a/Sources/c_snikket/iinclude/include/Date.h b/Sources/c_snikket/iinclude/include/Date.h
deleted file mode 100644
index 370b920..0000000
--- a/Sources/c_snikket/iinclude/include/Date.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Date
-#define INCLUDED_Date
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_8e4589df03e4f3cc_26_new)
-HX_DECLARE_CLASS0(Date)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Date_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Date_obj OBJ_;
-		Date_obj();
-
-	public:
-		enum { _hx_ClassId = 0x018f7872 };
-
-		void __construct(int year,int month,int day,int hour,int min,int sec);
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="Date")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"Date"); }
-
-		inline static ::hx::ObjectPtr< Date_obj > __new(int year,int month,int day,int hour,int min,int sec) {
-			::hx::ObjectPtr< Date_obj > __this = new Date_obj();
-			__this->__construct(year,month,day,hour,min,sec);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Date_obj > __alloc(::hx::Ctx *_hx_ctx,int year,int month,int day,int hour,int min,int sec) {
-			Date_obj *__this = (Date_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Date_obj), false, "Date"));
-			*(void **)__this = Date_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_8e4589df03e4f3cc_26_new)
-HXDLIN(  26)		( ( ::Date)(__this) )->mSeconds =  ::__hxcpp_new_date(year,month,day,hour,min,sec);
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Date_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Date",4e,82,3c,2d); }
-
-		static  ::Date now();
-		static ::Dynamic now_dyn();
-
-		static  ::Date fromTime(Float t);
-		static ::Dynamic fromTime_dyn();
-
-		Float mSeconds;
-		Float getTime();
-		::Dynamic getTime_dyn();
-
-		int getUTCHours();
-		::Dynamic getUTCHours_dyn();
-
-		int getUTCMinutes();
-		::Dynamic getUTCMinutes_dyn();
-
-		int getUTCSeconds();
-		::Dynamic getUTCSeconds_dyn();
-
-		int getUTCFullYear();
-		::Dynamic getUTCFullYear_dyn();
-
-		int getUTCMonth();
-		::Dynamic getUTCMonth_dyn();
-
-		int getUTCDate();
-		::Dynamic getUTCDate_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-
-#endif /* INCLUDED_Date */ 
diff --git a/Sources/c_snikket/iinclude/include/EReg.h b/Sources/c_snikket/iinclude/include/EReg.h
deleted file mode 100644
index 9cf6865..0000000
--- a/Sources/c_snikket/iinclude/include/EReg.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_EReg
-#define INCLUDED_EReg
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(EReg)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES EReg_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EReg_obj OBJ_;
-		EReg_obj();
-
-	public:
-		enum { _hx_ClassId = 0x022d4033 };
-
-		void __construct(::String r,::String opt);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="EReg")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"EReg"); }
-		static ::hx::ObjectPtr< EReg_obj > __new(::String r,::String opt);
-		static ::hx::ObjectPtr< EReg_obj > __alloc(::hx::Ctx *_hx_ctx,::String r,::String opt);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EReg_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("EReg",0f,4a,da,2d); }
-
-		 ::Dynamic r;
-		::String last;
-		bool global;
-		bool match(::String s);
-		::Dynamic match_dyn();
-
-		::String matched(int n);
-		::Dynamic matched_dyn();
-
-		 ::Dynamic matchedPos();
-		::Dynamic matchedPos_dyn();
-
-		bool matchSub(::String s,int pos,::hx::Null< int >  len);
-		::Dynamic matchSub_dyn();
-
-		::String replace(::String s,::String by);
-		::Dynamic replace_dyn();
-
-		::String map(::String s, ::Dynamic f);
-		::Dynamic map_dyn();
-
-};
-
-
-#endif /* INCLUDED_EReg */ 
diff --git a/Sources/c_snikket/iinclude/include/HaxeCBridge.h b/Sources/c_snikket/iinclude/include/HaxeCBridge.h
deleted file mode 100644
index 6c32ea0..0000000
--- a/Sources/c_snikket/iinclude/include/HaxeCBridge.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_HaxeCBridge
-#define INCLUDED_HaxeCBridge
-
-#ifndef HXCPP_H
-#ifdef HXCPP_API_LEVEL
-#include <hxcpp.h>
-#else
-#include <hx/Native.h>
-#endif
-#endif
-
-#ifndef INCLUDED_cbce7ceea2d0df24
-#define INCLUDED_cbce7ceea2d0df24
-#include "HaxeCBridge.h"
-#endif
-
-
-
-class HXCPP_CLASS_ATTRIBUTES HaxeCBridge
-{
-	public:
-		static void mainThreadInit(::cpp::Function< bool  () > isMainThreadCb);
-
-		static void mainThreadRun(::cpp::Function< void  () > processNativeCalls,::cpp::Function< void  (const char*) > onUnhandledException);
-
-		static void** retainHaxeArray(::cpp::VirtualArray haxeArray);
-
-		static void* retainHaxeObject( ::Dynamic haxeObject);
-
-		static const char* retainHaxeString(::String haxeString);
-
-		static void releaseHaxePtr(void * haxePtr);
-
-		static bool isMainThread();
-
-		static void endMainThread(bool waitOnScheduledEvents);
-
-		static void wakeMainThread();
-
-};
-
-
-#endif /* INCLUDED_HaxeCBridge */ 
diff --git a/Sources/c_snikket/iinclude/include/Lambda.h b/Sources/c_snikket/iinclude/include/Lambda.h
deleted file mode 100644
index 43b4ef0..0000000
--- a/Sources/c_snikket/iinclude/include/Lambda.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Lambda
-#define INCLUDED_Lambda
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Lambda)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Lambda_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Lambda_obj OBJ_;
-		Lambda_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4cec6e4b };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="Lambda")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"Lambda"); }
-
-		inline static ::hx::ObjectPtr< Lambda_obj > __new() {
-			::hx::ObjectPtr< Lambda_obj > __this = new Lambda_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Lambda_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Lambda_obj *__this = (Lambda_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Lambda_obj), false, "Lambda"));
-			*(void **)__this = Lambda_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Lambda_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Lambda",27,a7,54,85); }
-
-		static ::cpp::VirtualArray array( ::Dynamic it);
-		static ::Dynamic array_dyn();
-
-		static bool exists( ::Dynamic it, ::Dynamic f);
-		static ::Dynamic exists_dyn();
-
-		static ::cpp::VirtualArray filter( ::Dynamic it, ::Dynamic f);
-		static ::Dynamic filter_dyn();
-
-		static  ::Dynamic fold( ::Dynamic it, ::Dynamic f, ::Dynamic first);
-		static ::Dynamic fold_dyn();
-
-		static bool empty( ::Dynamic it);
-		static ::Dynamic empty_dyn();
-
-		static  ::Dynamic find( ::Dynamic it, ::Dynamic f);
-		static ::Dynamic find_dyn();
-
-		static int findIndex( ::Dynamic it, ::Dynamic f);
-		static ::Dynamic findIndex_dyn();
-
-};
-
-
-#endif /* INCLUDED_Lambda */ 
diff --git a/Sources/c_snikket/iinclude/include/Reflect.h b/Sources/c_snikket/iinclude/include/Reflect.h
deleted file mode 100644
index 87d8d52..0000000
--- a/Sources/c_snikket/iinclude/include/Reflect.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Reflect
-#define INCLUDED_Reflect
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Reflect)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Reflect_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Reflect_obj OBJ_;
-		Reflect_obj();
-
-	public:
-		enum { _hx_ClassId = 0x769a515d };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="Reflect")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"Reflect"); }
-
-		inline static ::hx::ObjectPtr< Reflect_obj > __new() {
-			::hx::ObjectPtr< Reflect_obj > __this = new Reflect_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Reflect_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Reflect_obj *__this = (Reflect_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Reflect_obj), false, "Reflect"));
-			*(void **)__this = Reflect_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Reflect_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Reflect",1d,ac,7a,b6); }
-
-		static bool hasField( ::Dynamic o,::String field);
-		static ::Dynamic hasField_dyn();
-
-		static  ::Dynamic field( ::Dynamic o,::String field);
-		static ::Dynamic field_dyn();
-
-		static void setField( ::Dynamic o,::String field, ::Dynamic value);
-		static ::Dynamic setField_dyn();
-
-		static  ::Dynamic getProperty( ::Dynamic o,::String field);
-		static ::Dynamic getProperty_dyn();
-
-		static  ::Dynamic callMethod( ::Dynamic o, ::Dynamic func,::cpp::VirtualArray args);
-		static ::Dynamic callMethod_dyn();
-
-		static ::Array< ::String > fields( ::Dynamic o);
-		static ::Dynamic fields_dyn();
-
-		static bool isFunction( ::Dynamic f);
-		static ::Dynamic isFunction_dyn();
-
-		static int compare( ::Dynamic a, ::Dynamic b);
-		static ::Dynamic compare_dyn();
-
-		static bool compareMethods( ::Dynamic f1, ::Dynamic f2);
-		static ::Dynamic compareMethods_dyn();
-
-		static bool isObject( ::Dynamic v);
-		static ::Dynamic isObject_dyn();
-
-		static bool isEnumValue( ::Dynamic v);
-		static ::Dynamic isEnumValue_dyn();
-
-		static  ::Dynamic copy( ::Dynamic o);
-		static ::Dynamic copy_dyn();
-
-};
-
-
-#endif /* INCLUDED_Reflect */ 
diff --git a/Sources/c_snikket/iinclude/include/Std.h b/Sources/c_snikket/iinclude/include/Std.h
deleted file mode 100644
index c837022..0000000
--- a/Sources/c_snikket/iinclude/include/Std.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Std
-#define INCLUDED_Std
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Std)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Std_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Std_obj OBJ_;
-		Std_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7ee3a517 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="Std")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"Std"); }
-
-		inline static ::hx::ObjectPtr< Std_obj > __new() {
-			::hx::ObjectPtr< Std_obj > __this = new Std_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Std_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Std_obj *__this = (Std_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Std_obj), false, "Std"));
-			*(void **)__this = Std_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Std_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Std",83,60,3f,00); }
-
-		static bool is( ::Dynamic v, ::Dynamic t);
-		static ::Dynamic is_dyn();
-
-		static bool isOfType( ::Dynamic v, ::Dynamic t);
-		static ::Dynamic isOfType_dyn();
-
-		static  ::Dynamic downcast( ::Dynamic value,::hx::Class c);
-		static ::Dynamic downcast_dyn();
-
-		static  ::Dynamic instance( ::Dynamic value,::hx::Class c);
-		static ::Dynamic instance_dyn();
-
-		static ::String string( ::Dynamic s);
-		static ::Dynamic string_dyn();
-
-		static int _hx_int(Float x);
-		static ::Dynamic _hx_int_dyn();
-
-		static  ::Dynamic parseInt(::String x);
-		static ::Dynamic parseInt_dyn();
-
-		static Float parseFloat(::String x);
-		static ::Dynamic parseFloat_dyn();
-
-		static int random(int x);
-		static ::Dynamic random_dyn();
-
-		static inline String string(String &s) { return s; }
-};
-
-
-#endif /* INCLUDED_Std */ 
diff --git a/Sources/c_snikket/iinclude/include/StringBuf.h b/Sources/c_snikket/iinclude/include/StringBuf.h
deleted file mode 100644
index 575e391..0000000
--- a/Sources/c_snikket/iinclude/include/StringBuf.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_StringBuf
-#define INCLUDED_StringBuf
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_8b63e6eaf513c097_35_new)
-HX_DECLARE_CLASS0(StringBuf)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES StringBuf_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StringBuf_obj OBJ_;
-		StringBuf_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2cc74002 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="StringBuf")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"StringBuf"); }
-
-		inline static ::hx::ObjectPtr< StringBuf_obj > __new() {
-			::hx::ObjectPtr< StringBuf_obj > __this = new StringBuf_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< StringBuf_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			StringBuf_obj *__this = (StringBuf_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(StringBuf_obj), true, "StringBuf"));
-			*(void **)__this = StringBuf_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_8b63e6eaf513c097_35_new)
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StringBuf_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("StringBuf",c2,ca,83,69); }
-
-		::Array< ::String > b;
-		::Array< char > charBuf;
-		::String charBufAsString();
-		::Dynamic charBufAsString_dyn();
-
-		void flush();
-		::Dynamic flush_dyn();
-
-		int get_length();
-		::Dynamic get_length_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-
-#endif /* INCLUDED_StringBuf */ 
diff --git a/Sources/c_snikket/iinclude/include/StringTools.h b/Sources/c_snikket/iinclude/include/StringTools.h
deleted file mode 100644
index 039cb8b..0000000
--- a/Sources/c_snikket/iinclude/include/StringTools.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_StringTools
-#define INCLUDED_StringTools
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(StringTools)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES StringTools_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StringTools_obj OBJ_;
-		StringTools_obj();
-
-	public:
-		enum { _hx_ClassId = 0x084f186e };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="StringTools")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"StringTools"); }
-
-		inline static ::hx::ObjectPtr< StringTools_obj > __new() {
-			::hx::ObjectPtr< StringTools_obj > __this = new StringTools_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< StringTools_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			StringTools_obj *__this = (StringTools_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(StringTools_obj), false, "StringTools"));
-			*(void **)__this = StringTools_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StringTools_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("StringTools",6a,db,63,03); }
-
-		static ::String urlEncode(::String s);
-		static ::Dynamic urlEncode_dyn();
-
-		static ::String htmlEscape(::String s, ::Dynamic quotes);
-		static ::Dynamic htmlEscape_dyn();
-
-		static bool startsWith(::String s,::String start);
-		static ::Dynamic startsWith_dyn();
-
-		static bool endsWith(::String s,::String end);
-		static ::Dynamic endsWith_dyn();
-
-		static bool isSpace(::String s,int pos);
-		static ::Dynamic isSpace_dyn();
-
-		static ::String ltrim(::String s);
-		static ::Dynamic ltrim_dyn();
-
-		static ::String rtrim(::String s);
-		static ::Dynamic rtrim_dyn();
-
-		static ::String trim(::String s);
-		static ::Dynamic trim_dyn();
-
-		static ::String lpad(::String s,::String c,int l);
-		static ::Dynamic lpad_dyn();
-
-		static ::String replace(::String s,::String sub,::String by);
-		static ::Dynamic replace_dyn();
-
-		static ::String hex(int n, ::Dynamic digits);
-		static ::Dynamic hex_dyn();
-
-};
-
-
-#endif /* INCLUDED_StringTools */ 
diff --git a/Sources/c_snikket/iinclude/include/Sys.h b/Sources/c_snikket/iinclude/include/Sys.h
deleted file mode 100644
index 4834a8a..0000000
--- a/Sources/c_snikket/iinclude/include/Sys.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Sys
-#define INCLUDED_Sys
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Sys)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Sys_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Sys_obj OBJ_;
-		Sys_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7ee3a981 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="Sys")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"Sys"); }
-
-		inline static ::hx::ObjectPtr< Sys_obj > __new() {
-			::hx::ObjectPtr< Sys_obj > __this = new Sys_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Sys_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Sys_obj *__this = (Sys_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Sys_obj), false, "Sys"));
-			*(void **)__this = Sys_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Sys_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Sys",ed,64,3f,00); }
-
-		static ::String getEnv(::String s);
-		static ::Dynamic getEnv_dyn();
-
-		static ::String getCwd();
-		static ::Dynamic getCwd_dyn();
-
-		static ::String systemName();
-		static ::Dynamic systemName_dyn();
-
-		static Float time();
-		static ::Dynamic time_dyn();
-
-};
-
-
-#endif /* INCLUDED_Sys */ 
diff --git a/Sources/c_snikket/iinclude/include/Type.h b/Sources/c_snikket/iinclude/include/Type.h
deleted file mode 100644
index 4c1fe40..0000000
--- a/Sources/c_snikket/iinclude/include/Type.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Type
-#define INCLUDED_Type
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Type)
-HX_DECLARE_CLASS0(ValueType)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Type_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Type_obj OBJ_;
-		Type_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0c3514fe };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="Type")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"Type"); }
-
-		inline static ::hx::ObjectPtr< Type_obj > __new() {
-			::hx::ObjectPtr< Type_obj > __this = new Type_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Type_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Type_obj *__this = (Type_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Type_obj), false, "Type"));
-			*(void **)__this = Type_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Type_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Type",da,1e,e2,37); }
-
-		static ::hx::Class getClass( ::Dynamic o);
-		static ::Dynamic getClass_dyn();
-
-		static ::String getClassName(::hx::Class c);
-		static ::Dynamic getClassName_dyn();
-
-		static ::Array< ::String > getInstanceFields(::hx::Class c);
-		static ::Dynamic getInstanceFields_dyn();
-
-		static  ::ValueType _hx_typeof( ::Dynamic v);
-		static ::Dynamic _hx_typeof_dyn();
-
-		static ::cpp::VirtualArray enumParameters( ::Dynamic e);
-		static ::Dynamic enumParameters_dyn();
-
-};
-
-
-#endif /* INCLUDED_Type */ 
diff --git a/Sources/c_snikket/iinclude/include/ValueType.h b/Sources/c_snikket/iinclude/include/ValueType.h
deleted file mode 100644
index ce988c6..0000000
--- a/Sources/c_snikket/iinclude/include/ValueType.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_ValueType
-#define INCLUDED_ValueType
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(ValueType)
-
-
-class ValueType_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef ValueType_obj OBJ_;
-
-	public:
-		ValueType_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("ValueType",ab,8a,60,3b); }
-		::String __ToString() const { return HX_("ValueType.",23,cb,18,b9) + _hx_tag; }
-
-		static ::ValueType TBool;
-		static inline ::ValueType TBool_dyn() { return TBool; }
-		static ::ValueType TClass(::hx::Class c);
-		static ::Dynamic TClass_dyn();
-		static ::ValueType TEnum(::hx::Class e);
-		static ::Dynamic TEnum_dyn();
-		static ::ValueType TFloat;
-		static inline ::ValueType TFloat_dyn() { return TFloat; }
-		static ::ValueType TFunction;
-		static inline ::ValueType TFunction_dyn() { return TFunction; }
-		static ::ValueType TInt;
-		static inline ::ValueType TInt_dyn() { return TInt; }
-		static ::ValueType TNull;
-		static inline ::ValueType TNull_dyn() { return TNull; }
-		static ::ValueType TObject;
-		static inline ::ValueType TObject_dyn() { return TObject; }
-		static ::ValueType TUnknown;
-		static inline ::ValueType TUnknown_dyn() { return TUnknown; }
-};
-
-
-#endif /* INCLUDED_ValueType */ 
diff --git a/Sources/c_snikket/iinclude/include/Xml.h b/Sources/c_snikket/iinclude/include/Xml.h
deleted file mode 100644
index 2b2f152..0000000
--- a/Sources/c_snikket/iinclude/include/Xml.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_Xml
-#define INCLUDED_Xml
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Xml)
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-
-
-
-class HXCPP_CLASS_ATTRIBUTES Xml_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Xml_obj OBJ_;
-		Xml_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7ee76a4b };
-
-		void __construct(int nodeType);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="Xml")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"Xml"); }
-		static ::hx::ObjectPtr< Xml_obj > __new(int nodeType);
-		static ::hx::ObjectPtr< Xml_obj > __alloc(::hx::Ctx *_hx_ctx,int nodeType);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Xml_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Xml",b7,25,43,00); }
-
-		static void __boot();
-		static int Element;
-		static int PCData;
-		static int CData;
-		static int Comment;
-		static int DocType;
-		static int ProcessingInstruction;
-		static int Document;
-		static  ::Xml parse(::String str);
-		static ::Dynamic parse_dyn();
-
-		static  ::Xml createElement(::String name);
-		static ::Dynamic createElement_dyn();
-
-		static  ::Xml createPCData(::String data);
-		static ::Dynamic createPCData_dyn();
-
-		static  ::Xml createCData(::String data);
-		static ::Dynamic createCData_dyn();
-
-		static  ::Xml createComment(::String data);
-		static ::Dynamic createComment_dyn();
-
-		static  ::Xml createDocType(::String data);
-		static ::Dynamic createDocType_dyn();
-
-		static  ::Xml createProcessingInstruction(::String data);
-		static ::Dynamic createProcessingInstruction_dyn();
-
-		static  ::Xml createDocument();
-		static ::Dynamic createDocument_dyn();
-
-		int nodeType;
-		::String nodeName;
-		::String nodeValue;
-		 ::Xml parent;
-		::Array< ::Dynamic> children;
-		 ::haxe::ds::StringMap attributeMap;
-		::String get(::String att);
-		::Dynamic get_dyn();
-
-		void set(::String att,::String value);
-		::Dynamic set_dyn();
-
-		bool exists(::String att);
-		::Dynamic exists_dyn();
-
-		 ::Dynamic attributes();
-		::Dynamic attributes_dyn();
-
-		 ::Xml firstElement();
-		::Dynamic firstElement_dyn();
-
-		void addChild( ::Xml x);
-		::Dynamic addChild_dyn();
-
-		bool removeChild( ::Xml x);
-		::Dynamic removeChild_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-
-#endif /* INCLUDED_Xml */ 
diff --git a/Sources/c_snikket/iinclude/include/_HaxeCBridge/Int64Map_Impl_.h b/Sources/c_snikket/iinclude/include/_HaxeCBridge/Int64Map_Impl_.h
deleted file mode 100644
index cf001a9..0000000
--- a/Sources/c_snikket/iinclude/include/_HaxeCBridge/Int64Map_Impl_.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED__HaxeCBridge_Int64Map_Impl_
-#define INCLUDED__HaxeCBridge_Int64Map_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(_HaxeCBridge,Int64Map_Impl_)
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,IntMap)
-
-namespace _HaxeCBridge{
-
-
-class HXCPP_CLASS_ATTRIBUTES Int64Map_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Int64Map_Impl__obj OBJ_;
-		Int64Map_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x09ceba9e };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="_HaxeCBridge.Int64Map_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"_HaxeCBridge.Int64Map_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Int64Map_Impl__obj > __new() {
-			::hx::ObjectPtr< Int64Map_Impl__obj > __this = new Int64Map_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Int64Map_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Int64Map_Impl__obj *__this = (Int64Map_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Int64Map_Impl__obj), false, "_HaxeCBridge.Int64Map_Impl_"));
-			*(void **)__this = Int64Map_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Int64Map_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Int64Map_Impl_",af,5c,92,21); }
-
-		static  ::haxe::ds::IntMap _new();
-		static ::Dynamic _new_dyn();
-
-};
-
-} // end namespace _HaxeCBridge
-
-#endif /* INCLUDED__HaxeCBridge_Int64Map_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/_HaxeCBridge/Internal.h b/Sources/c_snikket/iinclude/include/_HaxeCBridge/Internal.h
deleted file mode 100644
index a2a1fae..0000000
--- a/Sources/c_snikket/iinclude/include/_HaxeCBridge/Internal.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED__HaxeCBridge_Internal
-#define INCLUDED__HaxeCBridge_Internal
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(_HaxeCBridge,Internal)
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,IntMap)
-HX_DECLARE_CLASS2(sys,thread,Lock)
-
-namespace _HaxeCBridge{
-
-
-class HXCPP_CLASS_ATTRIBUTES Internal_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Internal_obj OBJ_;
-		Internal_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0f2147a8 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="_HaxeCBridge.Internal")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"_HaxeCBridge.Internal"); }
-
-		inline static ::hx::ObjectPtr< Internal_obj > __new() {
-			::hx::ObjectPtr< Internal_obj > __this = new Internal_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Internal_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Internal_obj *__this = (Internal_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Internal_obj), false, "_HaxeCBridge.Internal"));
-			*(void **)__this = Internal_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Internal_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Internal",5d,23,28,02); }
-
-		static void __boot();
-		static ::cpp::Function< bool  () > isMainThreadCb;
-		static Dynamic isMainThreadCb_dyn() { return isMainThreadCb;}
-		static  ::sys::thread::Lock mainThreadWaitLock;
-		static bool mainThreadLoopActive;
-		static bool mainThreadEndIfNoPending;
-		static  ::haxe::ds::IntMap gcRetainMap;
-};
-
-} // end namespace _HaxeCBridge
-
-#endif /* INCLUDED__HaxeCBridge_Internal */ 
diff --git a/Sources/c_snikket/iinclude/include/_UnicodeString/UnicodeString_Impl_.h b/Sources/c_snikket/iinclude/include/_UnicodeString/UnicodeString_Impl_.h
deleted file mode 100644
index eb2190b..0000000
--- a/Sources/c_snikket/iinclude/include/_UnicodeString/UnicodeString_Impl_.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED__UnicodeString_UnicodeString_Impl_
-#define INCLUDED__UnicodeString_UnicodeString_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(_UnicodeString,UnicodeString_Impl_)
-
-namespace _UnicodeString{
-
-
-class HXCPP_CLASS_ATTRIBUTES UnicodeString_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef UnicodeString_Impl__obj OBJ_;
-		UnicodeString_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x699a1cff };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="_UnicodeString.UnicodeString_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"_UnicodeString.UnicodeString_Impl_"); }
-
-		inline static ::hx::ObjectPtr< UnicodeString_Impl__obj > __new() {
-			::hx::ObjectPtr< UnicodeString_Impl__obj > __this = new UnicodeString_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< UnicodeString_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			UnicodeString_Impl__obj *__this = (UnicodeString_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(UnicodeString_Impl__obj), false, "_UnicodeString.UnicodeString_Impl_"));
-			*(void **)__this = UnicodeString_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~UnicodeString_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("UnicodeString_Impl_",ce,64,09,f3); }
-
-		static ::String charAt(::String this1,int index);
-		static ::Dynamic charAt_dyn();
-
-		static ::String substr(::String this1,int pos, ::Dynamic len);
-		static ::Dynamic substr_dyn();
-
-		static int get_length(::String this1);
-		static ::Dynamic get_length_dyn();
-
-};
-
-} // end namespace _UnicodeString
-
-#endif /* INCLUDED__UnicodeString_UnicodeString_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/_Xml/XmlType_Impl_.h b/Sources/c_snikket/iinclude/include/_Xml/XmlType_Impl_.h
deleted file mode 100644
index 43c8ecc..0000000
--- a/Sources/c_snikket/iinclude/include/_Xml/XmlType_Impl_.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED__Xml_XmlType_Impl_
-#define INCLUDED__Xml_XmlType_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(_Xml,XmlType_Impl_)
-
-namespace _Xml{
-
-
-class HXCPP_CLASS_ATTRIBUTES XmlType_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef XmlType_Impl__obj OBJ_;
-		XmlType_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x29df0a39 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="_Xml.XmlType_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"_Xml.XmlType_Impl_"); }
-
-		inline static ::hx::ObjectPtr< XmlType_Impl__obj > __new() {
-			::hx::ObjectPtr< XmlType_Impl__obj > __this = new XmlType_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< XmlType_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			XmlType_Impl__obj *__this = (XmlType_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(XmlType_Impl__obj), false, "_Xml.XmlType_Impl_"));
-			*(void **)__this = XmlType_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~XmlType_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("XmlType_Impl_",71,0b,9f,dd); }
-
-		static ::String toString(int this1);
-		static ::Dynamic toString_dyn();
-
-};
-
-} // end namespace _Xml
-
-#endif /* INCLUDED__Xml_XmlType_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/cpp/Lib.h b/Sources/c_snikket/iinclude/include/cpp/Lib.h
deleted file mode 100644
index 38d98b7..0000000
--- a/Sources/c_snikket/iinclude/include/cpp/Lib.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_cpp_Lib
-#define INCLUDED_cpp_Lib
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(cpp,Lib)
-
-namespace cpp{
-
-
-class HXCPP_CLASS_ATTRIBUTES Lib_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Lib_obj OBJ_;
-		Lib_obj();
-
-	public:
-		enum { _hx_ClassId = 0x561f6486 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="cpp.Lib")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"cpp.Lib"); }
-
-		inline static ::hx::ObjectPtr< Lib_obj > __new() {
-			::hx::ObjectPtr< Lib_obj > __this = new Lib_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Lib_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Lib_obj *__this = (Lib_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Lib_obj), false, "cpp.Lib"));
-			*(void **)__this = Lib_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Lib_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Lib",25,07,3a,00); }
-
-};
-
-} // end namespace cpp
-
-#endif /* INCLUDED_cpp_Lib */ 
diff --git a/Sources/c_snikket/iinclude/include/datetime/_DateTime/DateTime_Impl_.h b/Sources/c_snikket/iinclude/include/datetime/_DateTime/DateTime_Impl_.h
deleted file mode 100644
index 94bc87f..0000000
--- a/Sources/c_snikket/iinclude/include/datetime/_DateTime/DateTime_Impl_.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_datetime__DateTime_DateTime_Impl_
-#define INCLUDED_datetime__DateTime_DateTime_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(datetime,_DateTime,DateTime_Impl_)
-
-namespace datetime{
-namespace _DateTime{
-
-
-class HXCPP_CLASS_ATTRIBUTES DateTime_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DateTime_Impl__obj OBJ_;
-		DateTime_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x3ae93836 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="datetime._DateTime.DateTime_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"datetime._DateTime.DateTime_Impl_"); }
-
-		inline static ::hx::ObjectPtr< DateTime_Impl__obj > __new() {
-			::hx::ObjectPtr< DateTime_Impl__obj > __this = new DateTime_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< DateTime_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			DateTime_Impl__obj *__this = (DateTime_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(DateTime_Impl__obj), false, "datetime._DateTime.DateTime_Impl_"));
-			*(void **)__this = DateTime_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DateTime_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DateTime_Impl_",5b,c4,e6,72); }
-
-		static int getYear(Float this1);
-		static ::Dynamic getYear_dyn();
-
-		static Float yearStart(Float this1);
-		static ::Dynamic yearStart_dyn();
-
-		static bool isLeapYear(Float this1);
-		static ::Dynamic isLeapYear_dyn();
-
-};
-
-} // end namespace datetime
-} // end namespace _DateTime
-
-#endif /* INCLUDED_datetime__DateTime_DateTime_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/datetime/_DateTimeInterval/DateTimeInterval_Impl_.h b/Sources/c_snikket/iinclude/include/datetime/_DateTimeInterval/DateTimeInterval_Impl_.h
deleted file mode 100644
index 2d7ed1a..0000000
--- a/Sources/c_snikket/iinclude/include/datetime/_DateTimeInterval/DateTimeInterval_Impl_.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_datetime__DateTimeInterval_DateTimeInterval_Impl_
-#define INCLUDED_datetime__DateTimeInterval_DateTimeInterval_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(datetime,_DateTimeInterval,DateTimeInterval_Impl_)
-HX_DECLARE_CLASS2(datetime,cores,DateTimeIntervalCore)
-
-namespace datetime{
-namespace _DateTimeInterval{
-
-
-class HXCPP_CLASS_ATTRIBUTES DateTimeInterval_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DateTimeInterval_Impl__obj OBJ_;
-		DateTimeInterval_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x35e51cc0 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="datetime._DateTimeInterval.DateTimeInterval_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"datetime._DateTimeInterval.DateTimeInterval_Impl_"); }
-
-		inline static ::hx::ObjectPtr< DateTimeInterval_Impl__obj > __new() {
-			::hx::ObjectPtr< DateTimeInterval_Impl__obj > __this = new DateTimeInterval_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< DateTimeInterval_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			DateTimeInterval_Impl__obj *__this = (DateTimeInterval_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(DateTimeInterval_Impl__obj), false, "datetime._DateTimeInterval.DateTimeInterval_Impl_"));
-			*(void **)__this = DateTimeInterval_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DateTimeInterval_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DateTimeInterval_Impl_",80,46,d9,2e); }
-
-		static  ::datetime::cores::DateTimeIntervalCore create(Float begin,Float end);
-		static ::Dynamic create_dyn();
-
-};
-
-} // end namespace datetime
-} // end namespace _DateTimeInterval
-
-#endif /* INCLUDED_datetime__DateTimeInterval_DateTimeInterval_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/datetime/cores/DateTimeIntervalCore.h b/Sources/c_snikket/iinclude/include/datetime/cores/DateTimeIntervalCore.h
deleted file mode 100644
index 8cfdba1..0000000
--- a/Sources/c_snikket/iinclude/include/datetime/cores/DateTimeIntervalCore.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_datetime_cores_DateTimeIntervalCore
-#define INCLUDED_datetime_cores_DateTimeIntervalCore
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(datetime,cores,DateTimeIntervalCore)
-
-namespace datetime{
-namespace cores{
-
-
-class HXCPP_CLASS_ATTRIBUTES DateTimeIntervalCore_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DateTimeIntervalCore_obj OBJ_;
-		DateTimeIntervalCore_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2dc1c9d4 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="datetime.cores.DateTimeIntervalCore")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"datetime.cores.DateTimeIntervalCore"); }
-		static ::hx::ObjectPtr< DateTimeIntervalCore_obj > __new();
-		static ::hx::ObjectPtr< DateTimeIntervalCore_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DateTimeIntervalCore_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DateTimeIntervalCore",5f,bb,ed,3d); }
-
-		bool negative;
-		Float begin;
-		Float end;
-		int years;
-		int months;
-		int days;
-		int hours;
-		int minutes;
-		int seconds;
-		int getYears();
-		::Dynamic getYears_dyn();
-
-		int getMonths();
-		::Dynamic getMonths_dyn();
-
-		int getTotalMonths();
-		::Dynamic getTotalMonths_dyn();
-
-		int getDays();
-		::Dynamic getDays_dyn();
-
-		int getTotalDays();
-		::Dynamic getTotalDays_dyn();
-
-		int getHours();
-		::Dynamic getHours_dyn();
-
-		int getTotalHours();
-		::Dynamic getTotalHours_dyn();
-
-		int getMinutes();
-		::Dynamic getMinutes_dyn();
-
-		int getTotalMinutes();
-		::Dynamic getTotalMinutes_dyn();
-
-		int getSeconds();
-		::Dynamic getSeconds_dyn();
-
-		Float getTotalSeconds();
-		::Dynamic getTotalSeconds_dyn();
-
-};
-
-} // end namespace datetime
-} // end namespace cores
-
-#endif /* INCLUDED_datetime_cores_DateTimeIntervalCore */ 
diff --git a/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeIntervalUtils.h b/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeIntervalUtils.h
deleted file mode 100644
index f6bc00b..0000000
--- a/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeIntervalUtils.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_datetime_utils_DateTimeIntervalUtils
-#define INCLUDED_datetime_utils_DateTimeIntervalUtils
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(datetime,cores,DateTimeIntervalCore)
-HX_DECLARE_CLASS2(datetime,utils,DateTimeIntervalUtils)
-
-namespace datetime{
-namespace utils{
-
-
-class HXCPP_CLASS_ATTRIBUTES DateTimeIntervalUtils_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DateTimeIntervalUtils_obj OBJ_;
-		DateTimeIntervalUtils_obj();
-
-	public:
-		enum { _hx_ClassId = 0x144eafbf };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="datetime.utils.DateTimeIntervalUtils")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"datetime.utils.DateTimeIntervalUtils"); }
-
-		inline static ::hx::ObjectPtr< DateTimeIntervalUtils_obj > __new() {
-			::hx::ObjectPtr< DateTimeIntervalUtils_obj > __this = new DateTimeIntervalUtils_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< DateTimeIntervalUtils_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			DateTimeIntervalUtils_obj *__this = (DateTimeIntervalUtils_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(DateTimeIntervalUtils_obj), false, "datetime.utils.DateTimeIntervalUtils"));
-			*(void **)__this = DateTimeIntervalUtils_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DateTimeIntervalUtils_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DateTimeIntervalUtils",31,ec,93,52); }
-
-		static ::String strftime( ::datetime::cores::DateTimeIntervalCore dti,::String format);
-		static ::Dynamic strftime_dyn();
-
-};
-
-} // end namespace datetime
-} // end namespace utils
-
-#endif /* INCLUDED_datetime_utils_DateTimeIntervalUtils */ 
diff --git a/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeMonthUtils.h b/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeMonthUtils.h
deleted file mode 100644
index ab9584a..0000000
--- a/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeMonthUtils.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_datetime_utils_DateTimeMonthUtils
-#define INCLUDED_datetime_utils_DateTimeMonthUtils
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(datetime,utils,DateTimeMonthUtils)
-
-namespace datetime{
-namespace utils{
-
-
-class HXCPP_CLASS_ATTRIBUTES DateTimeMonthUtils_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DateTimeMonthUtils_obj OBJ_;
-		DateTimeMonthUtils_obj();
-
-	public:
-		enum { _hx_ClassId = 0x250427de };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="datetime.utils.DateTimeMonthUtils")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"datetime.utils.DateTimeMonthUtils"); }
-
-		inline static ::hx::ObjectPtr< DateTimeMonthUtils_obj > __new() {
-			::hx::ObjectPtr< DateTimeMonthUtils_obj > __this = new DateTimeMonthUtils_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< DateTimeMonthUtils_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			DateTimeMonthUtils_obj *__this = (DateTimeMonthUtils_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(DateTimeMonthUtils_obj), false, "datetime.utils.DateTimeMonthUtils"));
-			*(void **)__this = DateTimeMonthUtils_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DateTimeMonthUtils_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DateTimeMonthUtils",2c,90,be,68); }
-
-		static int days(int month,::hx::Null< bool >  isLeapYear);
-		static ::Dynamic days_dyn();
-
-		static int getMonth(int days,::hx::Null< bool >  isLeapYear);
-		static ::Dynamic getMonth_dyn();
-
-		static int getMonthDay(int days,::hx::Null< bool >  isLeapYear);
-		static ::Dynamic getMonthDay_dyn();
-
-		static int toSeconds(int month,::hx::Null< bool >  isLeapYear);
-		static ::Dynamic toSeconds_dyn();
-
-};
-
-} // end namespace datetime
-} // end namespace utils
-
-#endif /* INCLUDED_datetime_utils_DateTimeMonthUtils */ 
diff --git a/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeUtils.h b/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeUtils.h
deleted file mode 100644
index b774eb8..0000000
--- a/Sources/c_snikket/iinclude/include/datetime/utils/DateTimeUtils.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_datetime_utils_DateTimeUtils
-#define INCLUDED_datetime_utils_DateTimeUtils
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(datetime,utils,DateTimeUtils)
-
-namespace datetime{
-namespace utils{
-
-
-class HXCPP_CLASS_ATTRIBUTES DateTimeUtils_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DateTimeUtils_obj OBJ_;
-		DateTimeUtils_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4dd3c90c };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="datetime.utils.DateTimeUtils")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"datetime.utils.DateTimeUtils"); }
-
-		inline static ::hx::ObjectPtr< DateTimeUtils_obj > __new() {
-			::hx::ObjectPtr< DateTimeUtils_obj > __this = new DateTimeUtils_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< DateTimeUtils_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			DateTimeUtils_obj *__this = (DateTimeUtils_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(DateTimeUtils_obj), false, "datetime.utils.DateTimeUtils"));
-			*(void **)__this = DateTimeUtils_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DateTimeUtils_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DateTimeUtils",b6,22,76,b4); }
-
-		static Float fromString(::String str);
-		static ::Dynamic fromString_dyn();
-
-		static Float parse(::String str);
-		static ::Dynamic parse_dyn();
-
-		static Float fromIsoString(::String str);
-		static ::Dynamic fromIsoString_dyn();
-
-		static Float yearToStamp(int year);
-		static ::Dynamic yearToStamp_dyn();
-
-};
-
-} // end namespace datetime
-} // end namespace utils
-
-#endif /* INCLUDED_datetime_utils_DateTimeUtils */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/EntryPoint.h b/Sources/c_snikket/iinclude/include/haxe/EntryPoint.h
deleted file mode 100644
index 170f0e7..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/EntryPoint.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_EntryPoint
-#define INCLUDED_haxe_EntryPoint
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,EntryPoint)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES EntryPoint_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EntryPoint_obj OBJ_;
-		EntryPoint_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7dc0c864 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.EntryPoint")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.EntryPoint"); }
-
-		inline static ::hx::ObjectPtr< EntryPoint_obj > __new() {
-			::hx::ObjectPtr< EntryPoint_obj > __this = new EntryPoint_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< EntryPoint_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			EntryPoint_obj *__this = (EntryPoint_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(EntryPoint_obj), false, "haxe.EntryPoint"));
-			*(void **)__this = EntryPoint_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EntryPoint_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("EntryPoint",9e,d2,23,a2); }
-
-		static void run();
-		static ::Dynamic run_dyn();
-
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_EntryPoint */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/Exception.h b/Sources/c_snikket/iinclude/include/haxe/Exception.h
deleted file mode 100644
index 5e7cabd..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/Exception.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_Exception
-#define INCLUDED_haxe_Exception
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,Exception)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES Exception_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Exception_obj OBJ_;
-		Exception_obj();
-
-	public:
-		enum { _hx_ClassId = 0x677ddc49 };
-
-		void __construct(::String message, ::haxe::Exception previous, ::Dynamic native);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.Exception")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.Exception"); }
-		static ::hx::ObjectPtr< Exception_obj > __new(::String message, ::haxe::Exception previous, ::Dynamic native);
-		static ::hx::ObjectPtr< Exception_obj > __alloc(::hx::Ctx *_hx_ctx,::String message, ::haxe::Exception previous, ::Dynamic native);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Exception_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Exception",2f,f0,6c,eb); }
-
-		static  ::haxe::Exception caught( ::Dynamic value);
-		static ::Dynamic caught_dyn();
-
-		::String _hx___exceptionMessage;
-		::Array< ::String > _hx___nativeStack;
-		int _hx___skipStack;
-		 ::Dynamic _hx___nativeException;
-		 ::haxe::Exception _hx___previousException;
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-		::String get_message();
-		::Dynamic get_message_dyn();
-
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_Exception */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/IMap.h b/Sources/c_snikket/iinclude/include/haxe/IMap.h
deleted file mode 100644
index b3e5b1a..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/IMap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_IMap
-#define INCLUDED_haxe_IMap
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES IMap_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::Dynamic (::hx::Object :: *_hx_get)( ::Dynamic k); 
-		static inline  ::Dynamic get( ::Dynamic _hx_, ::Dynamic k) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::haxe::IMap_obj *>(_hx_.mPtr->_hx_getInterface(0x09c2bd39)))->_hx_get)(k);
-		}
-		 ::Dynamic (::hx::Object :: *_hx_keys)(); 
-		static inline  ::Dynamic keys( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::haxe::IMap_obj *>(_hx_.mPtr->_hx_getInterface(0x09c2bd39)))->_hx_keys)();
-		}
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_IMap */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/Log.h b/Sources/c_snikket/iinclude/include/haxe/Log.h
deleted file mode 100644
index 86c3163..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/Log.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_Log
-#define INCLUDED_haxe_Log
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,Log)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES Log_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Log_obj OBJ_;
-		Log_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3c235b1a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.Log")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.Log"); }
-
-		inline static ::hx::ObjectPtr< Log_obj > __new() {
-			::hx::ObjectPtr< Log_obj > __this = new Log_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Log_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Log_obj *__this = (Log_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Log_obj), false, "haxe.Log"));
-			*(void **)__this = Log_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Log_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Log",64,0c,3a,00); }
-
-		static void __boot();
-		static ::Dynamic trace;
-		static inline ::Dynamic &trace_dyn() {return trace; }
-
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_Log */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/MainEvent.h b/Sources/c_snikket/iinclude/include/haxe/MainEvent.h
deleted file mode 100644
index 472de6e..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/MainEvent.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_MainEvent
-#define INCLUDED_haxe_MainEvent
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,MainEvent)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES MainEvent_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MainEvent_obj OBJ_;
-		MainEvent_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0b5efb53 };
-
-		void __construct( ::Dynamic f,int p);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.MainEvent")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.MainEvent"); }
-		static ::hx::ObjectPtr< MainEvent_obj > __new( ::Dynamic f,int p);
-		static ::hx::ObjectPtr< MainEvent_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic f,int p);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MainEvent_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MainEvent",01,71,3b,31); }
-
-		 ::Dynamic f;
-		Dynamic f_dyn() { return f;}
-		 ::haxe::MainEvent prev;
-		 ::haxe::MainEvent next;
-		bool isBlocking;
-		Float nextRun;
-		int priority;
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_MainEvent */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/MainLoop.h b/Sources/c_snikket/iinclude/include/haxe/MainLoop.h
deleted file mode 100644
index d8ad31a..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/MainLoop.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_MainLoop
-#define INCLUDED_haxe_MainLoop
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,MainEvent)
-HX_DECLARE_CLASS1(haxe,MainLoop)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES MainLoop_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MainLoop_obj OBJ_;
-		MainLoop_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0c7b74e7 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.MainLoop")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.MainLoop"); }
-
-		inline static ::hx::ObjectPtr< MainLoop_obj > __new() {
-			::hx::ObjectPtr< MainLoop_obj > __this = new MainLoop_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< MainLoop_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			MainLoop_obj *__this = (MainLoop_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(MainLoop_obj), false, "haxe.MainLoop"));
-			*(void **)__this = MainLoop_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MainLoop_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MainLoop",5d,d7,eb,79); }
-
-		static  ::haxe::MainEvent pending;
-		static bool hasEvents();
-		static ::Dynamic hasEvents_dyn();
-
-		static void sortEvents();
-		static ::Dynamic sortEvents_dyn();
-
-		static Float tick();
-		static ::Dynamic tick_dyn();
-
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_MainLoop */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/NativeStackTrace.h b/Sources/c_snikket/iinclude/include/haxe/NativeStackTrace.h
deleted file mode 100644
index dc1054c..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/NativeStackTrace.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_NativeStackTrace
-#define INCLUDED_haxe_NativeStackTrace
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,NativeStackTrace)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES NativeStackTrace_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef NativeStackTrace_obj OBJ_;
-		NativeStackTrace_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3984963e };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.NativeStackTrace")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.NativeStackTrace"); }
-
-		inline static ::hx::ObjectPtr< NativeStackTrace_obj > __new() {
-			::hx::ObjectPtr< NativeStackTrace_obj > __this = new NativeStackTrace_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< NativeStackTrace_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			NativeStackTrace_obj *__this = (NativeStackTrace_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(NativeStackTrace_obj), false, "haxe.NativeStackTrace"));
-			*(void **)__this = NativeStackTrace_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~NativeStackTrace_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("NativeStackTrace",b4,5e,6d,3c); }
-
-		static void saveStack( ::Dynamic exception);
-		static ::Dynamic saveStack_dyn();
-
-		static ::Array< ::String > callStack();
-		static ::Dynamic callStack_dyn();
-
-		static ::Array< ::String > exceptionStack();
-		static ::Dynamic exceptionStack_dyn();
-
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_NativeStackTrace */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/StackItem.h b/Sources/c_snikket/iinclude/include/haxe/StackItem.h
deleted file mode 100644
index bf28552..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/StackItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_StackItem
-#define INCLUDED_haxe_StackItem
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,StackItem)
-namespace haxe{
-
-
-class StackItem_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef StackItem_obj OBJ_;
-
-	public:
-		StackItem_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("haxe.StackItem",13,26,c7,2d); }
-		::String __ToString() const { return HX_("StackItem.",73,53,dc,cb) + _hx_tag; }
-
-		static ::haxe::StackItem CFunction;
-		static inline ::haxe::StackItem CFunction_dyn() { return CFunction; }
-		static ::haxe::StackItem FilePos( ::haxe::StackItem s,::String file,int line, ::Dynamic column);
-		static ::Dynamic FilePos_dyn();
-		static ::haxe::StackItem LocalFunction( ::Dynamic v);
-		static ::Dynamic LocalFunction_dyn();
-		static ::haxe::StackItem Method(::String classname,::String method);
-		static ::Dynamic Method_dyn();
-		static ::haxe::StackItem Module(::String m);
-		static ::Dynamic Module_dyn();
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_StackItem */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/Timer.h b/Sources/c_snikket/iinclude/include/haxe/Timer.h
deleted file mode 100644
index 27ba251..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/Timer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_Timer
-#define INCLUDED_haxe_Timer
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,Timer)
-HX_DECLARE_CLASS3(sys,thread,_EventLoop,RegularEvent)
-HX_DECLARE_CLASS3(sys,thread,_Thread,HaxeThread)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES Timer_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Timer_obj OBJ_;
-		Timer_obj();
-
-	public:
-		enum { _hx_ClassId = 0x04eaa0bb };
-
-		void __construct(int time_ms);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.Timer")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.Timer"); }
-		static ::hx::ObjectPtr< Timer_obj > __new(int time_ms);
-		static ::hx::ObjectPtr< Timer_obj > __alloc(::hx::Ctx *_hx_ctx,int time_ms);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		static void __alloc_dynamic_functions(::hx::Ctx *_hx_alloc,Timer_obj *_hx_obj);
-		//~Timer_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Timer",a5,2f,63,a3); }
-
-		static  ::haxe::Timer delay( ::Dynamic f,int time_ms);
-		static ::Dynamic delay_dyn();
-
-		 ::sys::thread::_Thread::HaxeThread thread;
-		 ::sys::thread::_EventLoop::RegularEvent eventHandler;
-		void stop();
-		::Dynamic stop_dyn();
-
-		::Dynamic run;
-		inline ::Dynamic &run_dyn() {return run; }
-
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_Timer */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ValueException.h b/Sources/c_snikket/iinclude/include/haxe/ValueException.h
deleted file mode 100644
index b515757..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ValueException.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ValueException
-#define INCLUDED_haxe_ValueException
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_Exception
-#include <haxe/Exception.h>
-#endif
-HX_DECLARE_CLASS1(haxe,Exception)
-HX_DECLARE_CLASS1(haxe,ValueException)
-
-namespace haxe{
-
-
-class HXCPP_CLASS_ATTRIBUTES ValueException_obj : public  ::haxe::Exception_obj
-{
-	public:
-		typedef  ::haxe::Exception_obj super;
-		typedef ValueException_obj OBJ_;
-		ValueException_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0af01d58 };
-
-		void __construct( ::Dynamic value, ::haxe::Exception previous, ::Dynamic native);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ValueException")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ValueException"); }
-		static ::hx::ObjectPtr< ValueException_obj > __new( ::Dynamic value, ::haxe::Exception previous, ::Dynamic native);
-		static ::hx::ObjectPtr< ValueException_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic value, ::haxe::Exception previous, ::Dynamic native);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ValueException_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ValueException",be,0e,61,3f); }
-
-		 ::Dynamic value;
-};
-
-} // end namespace haxe
-
-#endif /* INCLUDED_haxe_ValueException */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/crypto/Base64.h b/Sources/c_snikket/iinclude/include/haxe/crypto/Base64.h
deleted file mode 100644
index 0f00eaf..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/crypto/Base64.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_crypto_Base64
-#define INCLUDED_haxe_crypto_Base64
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,crypto,Base64)
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-
-namespace haxe{
-namespace crypto{
-
-
-class HXCPP_CLASS_ATTRIBUTES Base64_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Base64_obj OBJ_;
-		Base64_obj();
-
-	public:
-		enum { _hx_ClassId = 0x08b38de6 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.crypto.Base64")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.crypto.Base64"); }
-
-		inline static ::hx::ObjectPtr< Base64_obj > __new() {
-			::hx::ObjectPtr< Base64_obj > __this = new Base64_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Base64_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Base64_obj *__this = (Base64_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Base64_obj), false, "haxe.crypto.Base64"));
-			*(void **)__this = Base64_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Base64_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Base64",af,71,bc,89); }
-
-		static void __boot();
-		static ::String CHARS;
-		static  ::haxe::io::Bytes BYTES;
-		static ::String URL_CHARS;
-		static  ::haxe::io::Bytes URL_BYTES;
-		static ::String encode( ::haxe::io::Bytes bytes,::hx::Null< bool >  complement);
-		static ::Dynamic encode_dyn();
-
-		static  ::haxe::io::Bytes decode(::String str,::hx::Null< bool >  complement);
-		static ::Dynamic decode_dyn();
-
-		static ::String urlEncode( ::haxe::io::Bytes bytes,::hx::Null< bool >  complement);
-		static ::Dynamic urlEncode_dyn();
-
-		static  ::haxe::io::Bytes urlDecode(::String str,::hx::Null< bool >  complement);
-		static ::Dynamic urlDecode_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace crypto
-
-#endif /* INCLUDED_haxe_crypto_Base64 */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/crypto/BaseCode.h b/Sources/c_snikket/iinclude/include/haxe/crypto/BaseCode.h
deleted file mode 100644
index bd80353..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/crypto/BaseCode.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_crypto_BaseCode
-#define INCLUDED_haxe_crypto_BaseCode
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,crypto,BaseCode)
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-
-namespace haxe{
-namespace crypto{
-
-
-class HXCPP_CLASS_ATTRIBUTES BaseCode_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef BaseCode_obj OBJ_;
-		BaseCode_obj();
-
-	public:
-		enum { _hx_ClassId = 0x34980465 };
-
-		void __construct( ::haxe::io::Bytes base);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.crypto.BaseCode")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.crypto.BaseCode"); }
-		static ::hx::ObjectPtr< BaseCode_obj > __new( ::haxe::io::Bytes base);
-		static ::hx::ObjectPtr< BaseCode_obj > __alloc(::hx::Ctx *_hx_ctx, ::haxe::io::Bytes base);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BaseCode_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("BaseCode",fe,5d,c4,cf); }
-
-		 ::haxe::io::Bytes base;
-		int nbits;
-		::Array< int > tbl;
-		 ::haxe::io::Bytes encodeBytes( ::haxe::io::Bytes b);
-		::Dynamic encodeBytes_dyn();
-
-		void initTable();
-		::Dynamic initTable_dyn();
-
-		 ::haxe::io::Bytes decodeBytes( ::haxe::io::Bytes b);
-		::Dynamic decodeBytes_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace crypto
-
-#endif /* INCLUDED_haxe_crypto_BaseCode */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/crypto/Sha1.h b/Sources/c_snikket/iinclude/include/haxe/crypto/Sha1.h
deleted file mode 100644
index e2986e1..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/crypto/Sha1.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_crypto_Sha1
-#define INCLUDED_haxe_crypto_Sha1
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_b388adc1457cbfc2_48_new)
-HX_DECLARE_CLASS2(haxe,crypto,Sha1)
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-
-namespace haxe{
-namespace crypto{
-
-
-class HXCPP_CLASS_ATTRIBUTES Sha1_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Sha1_obj OBJ_;
-		Sha1_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3a249b8c };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.crypto.Sha1")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.crypto.Sha1"); }
-
-		inline static ::hx::ObjectPtr< Sha1_obj > __new() {
-			::hx::ObjectPtr< Sha1_obj > __this = new Sha1_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Sha1_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Sha1_obj *__this = (Sha1_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Sha1_obj), false, "haxe.crypto.Sha1"));
-			*(void **)__this = Sha1_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_b388adc1457cbfc2_48_new)
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Sha1_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Sha1",a5,f4,2b,37); }
-
-		static  ::haxe::io::Bytes make( ::haxe::io::Bytes b);
-		static ::Dynamic make_dyn();
-
-		static ::Array< int > bytes2blks( ::haxe::io::Bytes b);
-		static ::Dynamic bytes2blks_dyn();
-
-		::Array< int > doEncode(::Array< int > x);
-		::Dynamic doEncode_dyn();
-
-		int ft(int t,int b,int c,int d);
-		::Dynamic ft_dyn();
-
-		int kt(int t);
-		::Dynamic kt_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace crypto
-
-#endif /* INCLUDED_haxe_crypto_Sha1 */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/crypto/Sha256.h b/Sources/c_snikket/iinclude/include/haxe/crypto/Sha256.h
deleted file mode 100644
index 6851954..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/crypto/Sha256.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_crypto_Sha256
-#define INCLUDED_haxe_crypto_Sha256
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_0a4e95b4276e5057_48_new)
-HX_DECLARE_CLASS2(haxe,crypto,Sha256)
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-
-namespace haxe{
-namespace crypto{
-
-
-class HXCPP_CLASS_ATTRIBUTES Sha256_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Sha256_obj OBJ_;
-		Sha256_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0c0976ea };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.crypto.Sha256")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.crypto.Sha256"); }
-
-		inline static ::hx::ObjectPtr< Sha256_obj > __new() {
-			::hx::ObjectPtr< Sha256_obj > __this = new Sha256_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Sha256_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Sha256_obj *__this = (Sha256_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Sha256_obj), false, "haxe.crypto.Sha256"));
-			*(void **)__this = Sha256_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_0a4e95b4276e5057_48_new)
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Sha256_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Sha256",87,18,8f,51); }
-
-		static  ::haxe::io::Bytes make( ::haxe::io::Bytes b);
-		static ::Dynamic make_dyn();
-
-		static ::Array< int > bytes2blks( ::haxe::io::Bytes b);
-		static ::Dynamic bytes2blks_dyn();
-
-		::Array< int > doEncode(::Array< int > m,int l);
-		::Dynamic doEncode_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace crypto
-
-#endif /* INCLUDED_haxe_crypto_Sha256 */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/BalancedTree.h b/Sources/c_snikket/iinclude/include/haxe/ds/BalancedTree.h
deleted file mode 100644
index 4f5b9e6..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/BalancedTree.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_BalancedTree
-#define INCLUDED_haxe_ds_BalancedTree
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_IMap
-#include <haxe/IMap.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,BalancedTree)
-HX_DECLARE_CLASS2(haxe,ds,TreeNode)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES BalancedTree_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef BalancedTree_obj OBJ_;
-		BalancedTree_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4cc9cf7f };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.BalancedTree")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.BalancedTree"); }
-		static ::hx::ObjectPtr< BalancedTree_obj > __new();
-		static ::hx::ObjectPtr< BalancedTree_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BalancedTree_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("BalancedTree",66,71,f8,aa); }
-
-		 ::haxe::ds::TreeNode root;
-		void set( ::Dynamic key, ::Dynamic value);
-		::Dynamic set_dyn();
-
-		 ::Dynamic get( ::Dynamic key);
-		::Dynamic get_dyn();
-
-		bool exists( ::Dynamic key);
-		::Dynamic exists_dyn();
-
-		 ::Dynamic keys();
-		::Dynamic keys_dyn();
-
-		 ::haxe::ds::TreeNode setLoop( ::Dynamic k, ::Dynamic v, ::haxe::ds::TreeNode node);
-		::Dynamic setLoop_dyn();
-
-		void keysLoop( ::haxe::ds::TreeNode node,::cpp::VirtualArray acc);
-		::Dynamic keysLoop_dyn();
-
-		 ::haxe::ds::TreeNode balance( ::haxe::ds::TreeNode l, ::Dynamic k, ::Dynamic v, ::haxe::ds::TreeNode r);
-		::Dynamic balance_dyn();
-
-		virtual int compare( ::Dynamic k1, ::Dynamic k2);
-		::Dynamic compare_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_BalancedTree */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/Either.h b/Sources/c_snikket/iinclude/include/haxe/ds/Either.h
deleted file mode 100644
index 64e3fd7..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/Either.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_Either
-#define INCLUDED_haxe_ds_Either
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,ds,Either)
-namespace haxe{
-namespace ds{
-
-
-class Either_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Either_obj OBJ_;
-
-	public:
-		Either_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("haxe.ds.Either",1c,1a,b7,a4); }
-		::String __ToString() const { return HX_("Either.",29,67,48,40) + _hx_tag; }
-
-		static ::haxe::ds::Either Left( ::Dynamic v);
-		static ::Dynamic Left_dyn();
-		static ::haxe::ds::Either Right( ::Dynamic v);
-		static ::Dynamic Right_dyn();
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_Either */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/EnumValueMap.h b/Sources/c_snikket/iinclude/include/haxe/ds/EnumValueMap.h
deleted file mode 100644
index 48f7525..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/EnumValueMap.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_EnumValueMap
-#define INCLUDED_haxe_ds_EnumValueMap
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_ds_BalancedTree
-#include <haxe/ds/BalancedTree.h>
-#endif
-#ifndef INCLUDED_haxe_IMap
-#include <haxe/IMap.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,BalancedTree)
-HX_DECLARE_CLASS2(haxe,ds,EnumValueMap)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES EnumValueMap_obj : public  ::haxe::ds::BalancedTree_obj
-{
-	public:
-		typedef  ::haxe::ds::BalancedTree_obj super;
-		typedef EnumValueMap_obj OBJ_;
-		EnumValueMap_obj();
-
-	public:
-		enum { _hx_ClassId = 0x34ccfa05 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.EnumValueMap")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.EnumValueMap"); }
-		static ::hx::ObjectPtr< EnumValueMap_obj > __new();
-		static ::hx::ObjectPtr< EnumValueMap_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EnumValueMap_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("EnumValueMap",ec,9b,fb,92); }
-
-		int compare( ::Dynamic _tmp_k1, ::Dynamic _tmp_k2);
-
-		int compareArgs(::cpp::VirtualArray a1,::cpp::VirtualArray a2);
-		::Dynamic compareArgs_dyn();
-
-		int compareArg( ::Dynamic v1, ::Dynamic v2);
-		::Dynamic compareArg_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_EnumValueMap */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/IntMap.h b/Sources/c_snikket/iinclude/include/haxe/ds/IntMap.h
deleted file mode 100644
index c5e3745..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/IntMap.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_IntMap
-#define INCLUDED_haxe_ds_IntMap
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_IMap
-#include <haxe/IMap.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,IntMap)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES IntMap_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef IntMap_obj OBJ_;
-		IntMap_obj();
-
-	public:
-		enum { _hx_ClassId = 0x269a1502 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.IntMap")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.IntMap"); }
-		static ::hx::ObjectPtr< IntMap_obj > __new();
-		static ::hx::ObjectPtr< IntMap_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IntMap_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		 ::Dynamic get_a7a2487a( ::Dynamic k);
-		::String __ToString() const { return HX_("IntMap",0d,a9,08,d3); }
-
-		 ::Dynamic h;
-		void set(int key, ::Dynamic value);
-		::Dynamic set_dyn();
-
-		 ::Dynamic get(int key);
-		::Dynamic get_dyn();
-
-		bool remove(int key);
-		::Dynamic remove_dyn();
-
-		 ::Dynamic keys();
-		::Dynamic keys_dyn();
-
-
-  inline void set(int key, ::null value) { __int_hash_set(HX_MAP_THIS,key,value); }
-  inline void set(int key, bool value) { __int_hash_set(HX_MAP_THIS,key,value); }
-  inline void set(int key, char value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, unsigned char value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, signed char value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, short value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, unsigned short value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, int value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, unsigned int value) { __int_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(int key, float value) { __int_hash_set_float(HX_MAP_THIS,key,value); }
-  inline void set(int key, double value) { __int_hash_set_float(HX_MAP_THIS,key,value); }
-  inline void set(int key, ::String value) { __int_hash_set_string(HX_MAP_THIS,key,value); }
-  inline void set(int key, cpp::Int64 value) { __int_hash_set_int64(HX_MAP_THIS,key,value); }
-
-  template<typename V, typename H>
-  inline void set(int key, const ::cpp::Struct<V,H> &value) {__int_hash_set(HX_MAP_THIS,key,value); }
-  template<typename F>
-  inline void set(int key, const ::cpp::Function<F> &value) {__int_hash_set(HX_MAP_THIS,key,value); }
-  template<typename V>
-  inline void set(int key, const ::cpp::Pointer<V> &value) {__int_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
-
-  template<typename VALUE>
-  inline void set(Dynamic &key, const VALUE &value) { set( (int)key, value ); }
-
-  inline bool get_bool(int key) { return __int_hash_get_bool(h,key); }
-  inline int get_int(int key) { return __int_hash_get_int(h,key); }
-  inline Float get_float(int key) { return __int_hash_get_float(h,key); }
-  inline String get_string(int key) { return __int_hash_get_string(h,key); }
-  inline cpp::Int64 get_int64(int key) { return __int_hash_get_int64(h,key); }
-
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_IntMap */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/List.h b/Sources/c_snikket/iinclude/include/haxe/ds/List.h
deleted file mode 100644
index f0559ec..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/List.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_List
-#define INCLUDED_haxe_ds_List
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,ds,List)
-HX_DECLARE_CLASS3(haxe,ds,_List,ListNode)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES List_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef List_obj OBJ_;
-		List_obj();
-
-	public:
-		enum { _hx_ClassId = 0x39a75d33 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.List")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.List"); }
-		static ::hx::ObjectPtr< List_obj > __new();
-		static ::hx::ObjectPtr< List_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~List_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("List",7e,48,8c,32); }
-
-		 ::haxe::ds::_List::ListNode h;
-		 ::haxe::ds::_List::ListNode q;
-		int length;
-		void push( ::Dynamic item);
-		::Dynamic push_dyn();
-
-		 ::Dynamic pop();
-		::Dynamic pop_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_List */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/ObjectMap.h b/Sources/c_snikket/iinclude/include/haxe/ds/ObjectMap.h
deleted file mode 100644
index 02cde81..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/ObjectMap.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_ObjectMap
-#define INCLUDED_haxe_ds_ObjectMap
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_IMap
-#include <haxe/IMap.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,ObjectMap)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES ObjectMap_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ObjectMap_obj OBJ_;
-		ObjectMap_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6cba6d44 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.ObjectMap")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.ObjectMap"); }
-		static ::hx::ObjectPtr< ObjectMap_obj > __new();
-		static ::hx::ObjectPtr< ObjectMap_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ObjectMap_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("ObjectMap",fd,a4,50,e5); }
-
-		 ::Dynamic h;
-		void set( ::Dynamic key, ::Dynamic value);
-		::Dynamic set_dyn();
-
-		 ::Dynamic get( ::Dynamic key);
-		::Dynamic get_dyn();
-
-		 ::Dynamic keys();
-		::Dynamic keys_dyn();
-
-
-  inline void set(Dynamic key, ::null value) { __object_hash_set(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, bool value) { __object_hash_set(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, char value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, unsigned char value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, signed char value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, short value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, unsigned short value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, int value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, unsigned int value) { __object_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, float value) { __object_hash_set_float(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, double value) { __object_hash_set_float(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, ::String value) { __object_hash_set_string(HX_MAP_THIS,key,value); }
-  inline void set(Dynamic key, cpp::Int64 value) { __object_hash_set_int64(HX_MAP_THIS,key,value); }
-
-
-  template<typename V, typename H>
-  inline void set(Dynamic key, const ::cpp::Struct<V,H> &value) {__object_hash_set(HX_MAP_THIS,key,value); }
-  template<typename V>
-  inline void set(Dynamic key, const ::cpp::Function<V> &value) {__object_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
-  template<typename V>
-  inline void set(Dynamic key, const ::cpp::Pointer<V> &value) {__object_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
-
-  inline bool get_bool(Dynamic key) { return __object_hash_get_bool(h,key); }
-  inline int get_int(Dynamic key) { return __object_hash_get_int(h,key); }
-  inline Float get_float(Dynamic key) { return __object_hash_get_float(h,key); }
-  inline String get_string(Dynamic key) { return __object_hash_get_string(h,key); }
-  inline cpp::Int64 get_int64(Dynamic key) { return __object_hash_get_int64(h,key); }
-
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_ObjectMap */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/Option.h b/Sources/c_snikket/iinclude/include/haxe/ds/Option.h
deleted file mode 100644
index f2703eb..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/Option.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_Option
-#define INCLUDED_haxe_ds_Option
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,ds,Option)
-namespace haxe{
-namespace ds{
-
-
-class Option_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Option_obj OBJ_;
-
-	public:
-		Option_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("haxe.ds.Option",4c,90,17,ac); }
-		::String __ToString() const { return HX_("Option.",f9,5a,4f,ad) + _hx_tag; }
-
-		static ::haxe::ds::Option None;
-		static inline ::haxe::ds::Option None_dyn() { return None; }
-		static ::haxe::ds::Option Some( ::Dynamic v);
-		static ::Dynamic Some_dyn();
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_Option */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/StringMap.h b/Sources/c_snikket/iinclude/include/haxe/ds/StringMap.h
deleted file mode 100644
index 527e7db..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/StringMap.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_StringMap
-#define INCLUDED_haxe_ds_StringMap
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_IMap
-#include <haxe/IMap.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES StringMap_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StringMap_obj OBJ_;
-		StringMap_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4260cd56 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.StringMap")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.StringMap"); }
-		static ::hx::ObjectPtr< StringMap_obj > __new();
-		static ::hx::ObjectPtr< StringMap_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StringMap_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		 ::Dynamic get_a7a2487a( ::Dynamic k);
-		::String __ToString() const { return HX_("StringMap",2b,12,8c,69); }
-
-		 ::Dynamic h;
-		void set(::String key, ::Dynamic value);
-		::Dynamic set_dyn();
-
-		 ::Dynamic get(::String key);
-		::Dynamic get_dyn();
-
-		bool exists(::String key);
-		::Dynamic exists_dyn();
-
-		bool remove(::String key);
-		::Dynamic remove_dyn();
-
-		 ::Dynamic keys();
-		::Dynamic keys_dyn();
-
-		 ::Dynamic iterator();
-		::Dynamic iterator_dyn();
-
-		void clear();
-		::Dynamic clear_dyn();
-
-
-  inline void set(String key, ::null value) { __string_hash_set(HX_MAP_THIS,key,value); }
-  inline void set(String key, bool value) { __string_hash_set(HX_MAP_THIS,key,value); }
-  inline void set(String key, char value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, unsigned char value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, signed char value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, short value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, unsigned short value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, int value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, unsigned int value) { __string_hash_set_int(HX_MAP_THIS,key,value); }
-  inline void set(String key, float value) { __string_hash_set_float(HX_MAP_THIS,key,value); }
-  inline void set(String key, double value) { __string_hash_set_float(HX_MAP_THIS,key,value); }
-  inline void set(String key, ::String value) { __string_hash_set_string(HX_MAP_THIS,key,value); }
-  inline void set(String key, cpp::Int64 value) { __string_hash_set_int64(HX_MAP_THIS,key,value); }
-
-  template<typename V, typename H>
-  inline void set(String key, const ::cpp::Struct<V,H> &value) {__string_hash_set(HX_MAP_THIS,key,value); }
-  template<typename V>
-  inline void set(String key, const ::cpp::Function<V> &value) {__string_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
-  template<typename V>
-  inline void set(String key, const ::cpp::Pointer<V> &value) {__string_hash_set(HX_MAP_THIS,key,(Dynamic)value ); }
-
-  template<typename VALUE>
-  inline void set(Dynamic &key, const VALUE &value) { set( (String)key, value ); }
-
-  inline bool get_bool(String key) { return __string_hash_get_bool(h,key); }
-  inline int get_int(String key) { return __string_hash_get_int(h,key); }
-  inline Float get_float(String key) { return __string_hash_get_float(h,key); }
-  inline String get_string(String key) { return __string_hash_get_string(h,key); }
-  inline cpp::Int64 get_int64(String key) { return __string_hash_get_int64(h,key); }
-
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_StringMap */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/TreeNode.h b/Sources/c_snikket/iinclude/include/haxe/ds/TreeNode.h
deleted file mode 100644
index 9eb45af..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/TreeNode.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds_TreeNode
-#define INCLUDED_haxe_ds_TreeNode
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_bd32df1abf02b23a_252_new)
-HX_DECLARE_CLASS2(haxe,ds,TreeNode)
-
-namespace haxe{
-namespace ds{
-
-
-class HXCPP_CLASS_ATTRIBUTES TreeNode_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef TreeNode_obj OBJ_;
-		TreeNode_obj();
-
-	public:
-		enum { _hx_ClassId = 0x723fa5d5 };
-
-		void __construct( ::haxe::ds::TreeNode l, ::Dynamic k, ::Dynamic v, ::haxe::ds::TreeNode r,::hx::Null< int >  __o_h);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds.TreeNode")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds.TreeNode"); }
-
-		inline static ::hx::ObjectPtr< TreeNode_obj > __new( ::haxe::ds::TreeNode l, ::Dynamic k, ::Dynamic v, ::haxe::ds::TreeNode r,::hx::Null< int >  __o_h) {
-			::hx::ObjectPtr< TreeNode_obj > __this = new TreeNode_obj();
-			__this->__construct(l,k,v,r,__o_h);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< TreeNode_obj > __alloc(::hx::Ctx *_hx_ctx, ::haxe::ds::TreeNode l, ::Dynamic k, ::Dynamic v, ::haxe::ds::TreeNode r,::hx::Null< int >  __o_h) {
-			TreeNode_obj *__this = (TreeNode_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(TreeNode_obj), true, "haxe.ds.TreeNode"));
-			*(void **)__this = TreeNode_obj::_hx_vtable;
-{
-            		int h = __o_h.Default(-1);
-            	HX_STACKFRAME(&_hx_pos_bd32df1abf02b23a_252_new)
-HXLINE( 253)		( ( ::haxe::ds::TreeNode)(__this) )->left = l;
-HXLINE( 254)		( ( ::haxe::ds::TreeNode)(__this) )->key = k;
-HXLINE( 255)		( ( ::haxe::ds::TreeNode)(__this) )->value = v;
-HXLINE( 256)		( ( ::haxe::ds::TreeNode)(__this) )->right = r;
-HXLINE( 257)		if ((h == -1)) {
-HXLINE( 258)			int _hx_tmp;
-HXDLIN( 258)			 ::haxe::ds::TreeNode _this = ( ( ::haxe::ds::TreeNode)(__this) )->left;
-HXDLIN( 258)			int _hx_tmp1;
-HXDLIN( 258)			if (::hx::IsNull( _this )) {
-HXLINE( 258)				_hx_tmp1 = 0;
-            			}
-            			else {
-HXLINE( 258)				_hx_tmp1 = _this->_height;
-            			}
-HXDLIN( 258)			 ::haxe::ds::TreeNode _this1 = ( ( ::haxe::ds::TreeNode)(__this) )->right;
-HXDLIN( 258)			int _hx_tmp2;
-HXDLIN( 258)			if (::hx::IsNull( _this1 )) {
-HXLINE( 258)				_hx_tmp2 = 0;
-            			}
-            			else {
-HXLINE( 258)				_hx_tmp2 = _this1->_height;
-            			}
-HXDLIN( 258)			if ((_hx_tmp1 > _hx_tmp2)) {
-HXLINE( 258)				 ::haxe::ds::TreeNode _this2 = ( ( ::haxe::ds::TreeNode)(__this) )->left;
-HXDLIN( 258)				if (::hx::IsNull( _this2 )) {
-HXLINE( 258)					_hx_tmp = 0;
-            				}
-            				else {
-HXLINE( 258)					_hx_tmp = _this2->_height;
-            				}
-            			}
-            			else {
-HXLINE( 258)				 ::haxe::ds::TreeNode _this3 = ( ( ::haxe::ds::TreeNode)(__this) )->right;
-HXDLIN( 258)				if (::hx::IsNull( _this3 )) {
-HXLINE( 258)					_hx_tmp = 0;
-            				}
-            				else {
-HXLINE( 258)					_hx_tmp = _this3->_height;
-            				}
-            			}
-HXDLIN( 258)			( ( ::haxe::ds::TreeNode)(__this) )->_height = (_hx_tmp + 1);
-            		}
-            		else {
-HXLINE( 260)			( ( ::haxe::ds::TreeNode)(__this) )->_height = h;
-            		}
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~TreeNode_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("TreeNode",a0,92,83,06); }
-
-		 ::haxe::ds::TreeNode left;
-		 ::haxe::ds::TreeNode right;
-		 ::Dynamic key;
-		 ::Dynamic value;
-		int _height;
-};
-
-} // end namespace haxe
-} // end namespace ds
-
-#endif /* INCLUDED_haxe_ds_TreeNode */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/ds/_List/ListNode.h b/Sources/c_snikket/iinclude/include/haxe/ds/_List/ListNode.h
deleted file mode 100644
index c8b20b9..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/ds/_List/ListNode.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_ds__List_ListNode
-#define INCLUDED_haxe_ds__List_ListNode
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_d7fe8fcac3c6136e_266_new)
-HX_DECLARE_CLASS3(haxe,ds,_List,ListNode)
-
-namespace haxe{
-namespace ds{
-namespace _List{
-
-
-class HXCPP_CLASS_ATTRIBUTES ListNode_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ListNode_obj OBJ_;
-		ListNode_obj();
-
-	public:
-		enum { _hx_ClassId = 0x567ed068 };
-
-		void __construct( ::Dynamic item, ::haxe::ds::_List::ListNode next);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds._List.ListNode")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds._List.ListNode"); }
-
-		inline static ::hx::ObjectPtr< ListNode_obj > __new( ::Dynamic item, ::haxe::ds::_List::ListNode next) {
-			::hx::ObjectPtr< ListNode_obj > __this = new ListNode_obj();
-			__this->__construct(item,next);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< ListNode_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic item, ::haxe::ds::_List::ListNode next) {
-			ListNode_obj *__this = (ListNode_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ListNode_obj), true, "haxe.ds._List.ListNode"));
-			*(void **)__this = ListNode_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_d7fe8fcac3c6136e_266_new)
-HXLINE( 267)		( ( ::haxe::ds::_List::ListNode)(__this) )->item = item;
-HXLINE( 268)		( ( ::haxe::ds::_List::ListNode)(__this) )->next = next;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ListNode_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ListNode",a0,95,b0,02); }
-
-		 ::Dynamic item;
-		 ::haxe::ds::_List::ListNode next;
-};
-
-} // end namespace haxe
-} // end namespace ds
-} // end namespace _List
-
-#endif /* INCLUDED_haxe_ds__List_ListNode */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/exceptions/NotImplementedException.h b/Sources/c_snikket/iinclude/include/haxe/exceptions/NotImplementedException.h
deleted file mode 100644
index 8af474a..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/exceptions/NotImplementedException.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_exceptions_NotImplementedException
-#define INCLUDED_haxe_exceptions_NotImplementedException
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_exceptions_PosException
-#include <haxe/exceptions/PosException.h>
-#endif
-HX_DECLARE_STACK_FRAME(_hx_pos_6becf3ac06fb2a12_8_new)
-HX_DECLARE_CLASS1(haxe,Exception)
-HX_DECLARE_CLASS2(haxe,exceptions,NotImplementedException)
-HX_DECLARE_CLASS2(haxe,exceptions,PosException)
-
-namespace haxe{
-namespace exceptions{
-
-
-class HXCPP_CLASS_ATTRIBUTES NotImplementedException_obj : public  ::haxe::exceptions::PosException_obj
-{
-	public:
-		typedef  ::haxe::exceptions::PosException_obj super;
-		typedef NotImplementedException_obj OBJ_;
-		NotImplementedException_obj();
-
-	public:
-		enum { _hx_ClassId = 0x081bdbd6 };
-
-		void __construct(::String __o_message, ::haxe::Exception previous, ::Dynamic pos);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.exceptions.NotImplementedException")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.exceptions.NotImplementedException"); }
-
-		inline static ::hx::ObjectPtr< NotImplementedException_obj > __new(::String __o_message, ::haxe::Exception previous, ::Dynamic pos) {
-			::hx::ObjectPtr< NotImplementedException_obj > __this = new NotImplementedException_obj();
-			__this->__construct(__o_message,previous,pos);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< NotImplementedException_obj > __alloc(::hx::Ctx *_hx_ctx,::String __o_message, ::haxe::Exception previous, ::Dynamic pos) {
-			NotImplementedException_obj *__this = (NotImplementedException_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(NotImplementedException_obj), true, "haxe.exceptions.NotImplementedException"));
-			*(void **)__this = NotImplementedException_obj::_hx_vtable;
-{
-            		::String message = __o_message;
-            		if (::hx::IsNull(__o_message)) message = HX_("Not implemented",15,1e,32,34);
-            	HX_STACKFRAME(&_hx_pos_6becf3ac06fb2a12_8_new)
-HXDLIN(   8)		__this->super::__construct(message,previous,pos);
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~NotImplementedException_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("NotImplementedException",c0,57,2c,4a); }
-
-};
-
-} // end namespace haxe
-} // end namespace exceptions
-
-#endif /* INCLUDED_haxe_exceptions_NotImplementedException */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/exceptions/PosException.h b/Sources/c_snikket/iinclude/include/haxe/exceptions/PosException.h
deleted file mode 100644
index df1f2b8..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/exceptions/PosException.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_exceptions_PosException
-#define INCLUDED_haxe_exceptions_PosException
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_Exception
-#include <haxe/Exception.h>
-#endif
-HX_DECLARE_STACK_FRAME(_hx_pos_9487fa79a58895e3_12_new)
-HX_DECLARE_CLASS1(haxe,Exception)
-HX_DECLARE_CLASS2(haxe,exceptions,PosException)
-
-namespace haxe{
-namespace exceptions{
-
-
-class HXCPP_CLASS_ATTRIBUTES PosException_obj : public  ::haxe::Exception_obj
-{
-	public:
-		typedef  ::haxe::Exception_obj super;
-		typedef PosException_obj OBJ_;
-		PosException_obj();
-
-	public:
-		enum { _hx_ClassId = 0x65f7252d };
-
-		void __construct(::String message, ::haxe::Exception previous, ::Dynamic pos);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.exceptions.PosException")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.exceptions.PosException"); }
-
-		inline static ::hx::ObjectPtr< PosException_obj > __new(::String message, ::haxe::Exception previous, ::Dynamic pos) {
-			::hx::ObjectPtr< PosException_obj > __this = new PosException_obj();
-			__this->__construct(message,previous,pos);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< PosException_obj > __alloc(::hx::Ctx *_hx_ctx,::String message, ::haxe::Exception previous, ::Dynamic pos) {
-			PosException_obj *__this = (PosException_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(PosException_obj), true, "haxe.exceptions.PosException"));
-			*(void **)__this = PosException_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_9487fa79a58895e3_12_new)
-HXLINE(  13)		__this->super::__construct(message,previous,null());
-HXLINE(  14)		if (::hx::IsNull( pos )) {
-HXLINE(  15)			( ( ::haxe::exceptions::PosException)(__this) )->posInfos = ::hx::SourceInfo(HX_("(unknown)",87,5d,fc,5f),0,HX_("(unknown)",87,5d,fc,5f),HX_("(unknown)",87,5d,fc,5f));
-            		}
-            		else {
-HXLINE(  17)			( ( ::haxe::exceptions::PosException)(__this) )->posInfos = pos;
-            		}
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~PosException_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("PosException",3b,8c,23,b9); }
-
-		 ::Dynamic posInfos;
-		virtual ::String toString();
-
-};
-
-} // end namespace haxe
-} // end namespace exceptions
-
-#endif /* INCLUDED_haxe_exceptions_PosException */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/format/JsonParser.h b/Sources/c_snikket/iinclude/include/haxe/format/JsonParser.h
deleted file mode 100644
index be8707a..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/format/JsonParser.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_format_JsonParser
-#define INCLUDED_haxe_format_JsonParser
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,format,JsonParser)
-
-namespace haxe{
-namespace format{
-
-
-class HXCPP_CLASS_ATTRIBUTES JsonParser_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef JsonParser_obj OBJ_;
-		JsonParser_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0ae51690 };
-
-		void __construct(::String str);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.format.JsonParser")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.format.JsonParser"); }
-		static ::hx::ObjectPtr< JsonParser_obj > __new(::String str);
-		static ::hx::ObjectPtr< JsonParser_obj > __alloc(::hx::Ctx *_hx_ctx,::String str);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~JsonParser_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("JsonParser",47,65,2e,25); }
-
-		::String str;
-		int pos;
-		 ::Dynamic doParse();
-		::Dynamic doParse_dyn();
-
-		 ::Dynamic parseRec();
-		::Dynamic parseRec_dyn();
-
-		::String parseString();
-		::Dynamic parseString_dyn();
-
-		void invalidChar();
-		::Dynamic invalidChar_dyn();
-
-		void invalidNumber(int start);
-		::Dynamic invalidNumber_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace format
-
-#endif /* INCLUDED_haxe_format_JsonParser */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/format/JsonPrinter.h b/Sources/c_snikket/iinclude/include/haxe/format/JsonPrinter.h
deleted file mode 100644
index 4ac12b9..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/format/JsonPrinter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_format_JsonPrinter
-#define INCLUDED_haxe_format_JsonPrinter
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(StringBuf)
-HX_DECLARE_CLASS2(haxe,format,JsonPrinter)
-
-namespace haxe{
-namespace format{
-
-
-class HXCPP_CLASS_ATTRIBUTES JsonPrinter_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef JsonPrinter_obj OBJ_;
-		JsonPrinter_obj();
-
-	public:
-		enum { _hx_ClassId = 0x385642d1 };
-
-		void __construct( ::Dynamic replacer,::String space);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.format.JsonPrinter")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.format.JsonPrinter"); }
-		static ::hx::ObjectPtr< JsonPrinter_obj > __new( ::Dynamic replacer,::String space);
-		static ::hx::ObjectPtr< JsonPrinter_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic replacer,::String space);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~JsonPrinter_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("JsonPrinter",72,68,9d,fd); }
-
-		static ::String print( ::Dynamic o, ::Dynamic replacer,::String space);
-		static ::Dynamic print_dyn();
-
-		 ::StringBuf buf;
-		 ::Dynamic replacer;
-		Dynamic replacer_dyn() { return replacer;}
-		::String indent;
-		bool pretty;
-		int nind;
-		void write( ::Dynamic k, ::Dynamic v);
-		::Dynamic write_dyn();
-
-		void classString( ::Dynamic v);
-		::Dynamic classString_dyn();
-
-		void fieldsString( ::Dynamic v,::Array< ::String > fields);
-		::Dynamic fieldsString_dyn();
-
-		void quote(::String s);
-		::Dynamic quote_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace format
-
-#endif /* INCLUDED_haxe_format_JsonPrinter */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/http/HttpBase.h b/Sources/c_snikket/iinclude/include/haxe/http/HttpBase.h
deleted file mode 100644
index fb9bfeb..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/http/HttpBase.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_http_HttpBase
-#define INCLUDED_haxe_http_HttpBase
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,http,HttpBase)
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-
-namespace haxe{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES HttpBase_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HttpBase_obj OBJ_;
-		HttpBase_obj();
-
-	public:
-		enum { _hx_ClassId = 0x10c0921f };
-
-		void __construct(::String url);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.http.HttpBase")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.http.HttpBase"); }
-		static ::hx::ObjectPtr< HttpBase_obj > __new(::String url);
-		static ::hx::ObjectPtr< HttpBase_obj > __alloc(::hx::Ctx *_hx_ctx,::String url);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		static void __alloc_dynamic_functions(::hx::Ctx *_hx_alloc,HttpBase_obj *_hx_obj);
-		//~HttpBase_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HttpBase",d9,cf,1a,f8); }
-
-		::String url;
-		 ::haxe::io::Bytes responseBytes;
-		::String responseAsString;
-		::String postData;
-		 ::haxe::io::Bytes postBytes;
-		::Array< ::Dynamic> headers;
-		::Array< ::Dynamic> params;
-		 ::Dynamic emptyOnData;
-		Dynamic emptyOnData_dyn() { return emptyOnData;}
-		void setHeader(::String name,::String value);
-		::Dynamic setHeader_dyn();
-
-		void setPostData(::String data);
-		::Dynamic setPostData_dyn();
-
-		::Dynamic onData;
-		inline ::Dynamic &onData_dyn() {return onData; }
-
-		::Dynamic onBytes;
-		inline ::Dynamic &onBytes_dyn() {return onBytes; }
-
-		::Dynamic onError;
-		inline ::Dynamic &onError_dyn() {return onError; }
-
-		::Dynamic onStatus;
-		inline ::Dynamic &onStatus_dyn() {return onStatus; }
-
-		bool hasOnData();
-		::Dynamic hasOnData_dyn();
-
-		void success( ::haxe::io::Bytes data);
-		::Dynamic success_dyn();
-
-		::String get_responseData();
-		::Dynamic get_responseData_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace http
-
-#endif /* INCLUDED_haxe_http_HttpBase */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Bytes.h b/Sources/c_snikket/iinclude/include/haxe/io/Bytes.h
deleted file mode 100644
index 49850b2..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Bytes.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Bytes
-#define INCLUDED_haxe_io_Bytes
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Encoding)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES Bytes_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Bytes_obj OBJ_;
-		Bytes_obj();
-
-	public:
-		enum { _hx_ClassId = 0x195c64b7 };
-
-		void __construct(int length,::Array< unsigned char > b);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.io.Bytes")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.io.Bytes"); }
-		static ::hx::ObjectPtr< Bytes_obj > __new(int length,::Array< unsigned char > b);
-		static ::hx::ObjectPtr< Bytes_obj > __alloc(::hx::Ctx *_hx_ctx,int length,::Array< unsigned char > b);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Bytes_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Bytes",4b,78,c5,50); }
-
-		static  ::haxe::io::Bytes alloc(int length);
-		static ::Dynamic alloc_dyn();
-
-		static  ::haxe::io::Bytes ofString(::String s, ::haxe::io::Encoding encoding);
-		static ::Dynamic ofString_dyn();
-
-		static  ::haxe::io::Bytes ofData(::Array< unsigned char > b);
-		static ::Dynamic ofData_dyn();
-
-		static  ::haxe::io::Bytes ofHex(::String s);
-		static ::Dynamic ofHex_dyn();
-
-		int length;
-		::Array< unsigned char > b;
-		void blit(int pos, ::haxe::io::Bytes src,int srcpos,int len);
-		::Dynamic blit_dyn();
-
-		void fill(int pos,int len,int value);
-		::Dynamic fill_dyn();
-
-		 ::haxe::io::Bytes sub(int pos,int len);
-		::Dynamic sub_dyn();
-
-		::String getString(int pos,int len, ::haxe::io::Encoding encoding);
-		::Dynamic getString_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-		::String toHex();
-		::Dynamic toHex_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Bytes */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/BytesBuffer.h b/Sources/c_snikket/iinclude/include/haxe/io/BytesBuffer.h
deleted file mode 100644
index 531cf7a..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/BytesBuffer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_BytesBuffer
-#define INCLUDED_haxe_io_BytesBuffer
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,BytesBuffer)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES BytesBuffer_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef BytesBuffer_obj OBJ_;
-		BytesBuffer_obj();
-
-	public:
-		enum { _hx_ClassId = 0x183160df };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.io.BytesBuffer")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.io.BytesBuffer"); }
-		static ::hx::ObjectPtr< BytesBuffer_obj > __new();
-		static ::hx::ObjectPtr< BytesBuffer_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BytesBuffer_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("BytesBuffer",ab,73,22,f6); }
-
-		::Array< unsigned char > b;
-		 ::haxe::io::Bytes getBytes();
-		::Dynamic getBytes_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_BytesBuffer */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/BytesInput.h b/Sources/c_snikket/iinclude/include/haxe/io/BytesInput.h
deleted file mode 100644
index 4385c8d..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/BytesInput.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_BytesInput
-#define INCLUDED_haxe_io_BytesInput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Input
-#include <haxe/io/Input.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,BytesInput)
-HX_DECLARE_CLASS2(haxe,io,Input)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES BytesInput_obj : public  ::haxe::io::Input_obj
-{
-	public:
-		typedef  ::haxe::io::Input_obj super;
-		typedef BytesInput_obj OBJ_;
-		BytesInput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7e26810b };
-
-		void __construct( ::haxe::io::Bytes b, ::Dynamic pos, ::Dynamic len);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.io.BytesInput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.io.BytesInput"); }
-		static ::hx::ObjectPtr< BytesInput_obj > __new( ::haxe::io::Bytes b, ::Dynamic pos, ::Dynamic len);
-		static ::hx::ObjectPtr< BytesInput_obj > __alloc(::hx::Ctx *_hx_ctx, ::haxe::io::Bytes b, ::Dynamic pos, ::Dynamic len);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BytesInput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("BytesInput",bf,cb,76,e6); }
-
-		::Array< unsigned char > b;
-		int pos;
-		int len;
-		int totlen;
-		int readByte();
-
-		int readBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_BytesInput */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/BytesOutput.h b/Sources/c_snikket/iinclude/include/haxe/io/BytesOutput.h
deleted file mode 100644
index 15fc989..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/BytesOutput.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_BytesOutput
-#define INCLUDED_haxe_io_BytesOutput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Output
-#include <haxe/io/Output.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,BytesBuffer)
-HX_DECLARE_CLASS2(haxe,io,BytesOutput)
-HX_DECLARE_CLASS2(haxe,io,Output)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES BytesOutput_obj : public  ::haxe::io::Output_obj
-{
-	public:
-		typedef  ::haxe::io::Output_obj super;
-		typedef BytesOutput_obj OBJ_;
-		BytesOutput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x541db2e0 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.io.BytesOutput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.io.BytesOutput"); }
-		static ::hx::ObjectPtr< BytesOutput_obj > __new();
-		static ::hx::ObjectPtr< BytesOutput_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BytesOutput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("BytesOutput",ac,c5,0e,32); }
-
-		 ::haxe::io::BytesBuffer b;
-		void writeByte(int c);
-
-		int writeBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-		 ::haxe::io::Bytes getBytes();
-		::Dynamic getBytes_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_BytesOutput */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Encoding.h b/Sources/c_snikket/iinclude/include/haxe/io/Encoding.h
deleted file mode 100644
index 2103145..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Encoding.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Encoding
-#define INCLUDED_haxe_io_Encoding
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Encoding)
-namespace haxe{
-namespace io{
-
-
-class Encoding_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Encoding_obj OBJ_;
-
-	public:
-		Encoding_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("haxe.io.Encoding",33,a6,6d,22); }
-		::String __ToString() const { return HX_("Encoding.",db,8b,f5,be) + _hx_tag; }
-
-		static ::haxe::io::Encoding RawNative;
-		static inline ::haxe::io::Encoding RawNative_dyn() { return RawNative; }
-		static ::haxe::io::Encoding UTF8;
-		static inline ::haxe::io::Encoding UTF8_dyn() { return UTF8; }
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Encoding */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Eof.h b/Sources/c_snikket/iinclude/include/haxe/io/Eof.h
deleted file mode 100644
index 4daee4e..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Eof.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Eof
-#define INCLUDED_haxe_io_Eof
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_c4f7e3feda612c90_29_new)
-HX_DECLARE_CLASS2(haxe,io,Eof)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES Eof_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Eof_obj OBJ_;
-		Eof_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1d7955d0 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.io.Eof")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.io.Eof"); }
-
-		inline static ::hx::ObjectPtr< Eof_obj > __new() {
-			::hx::ObjectPtr< Eof_obj > __this = new Eof_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Eof_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Eof_obj *__this = (Eof_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Eof_obj), false, "haxe.io.Eof"));
-			*(void **)__this = Eof_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_c4f7e3feda612c90_29_new)
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Eof_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Eof",9c,bc,34,00); }
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Eof */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Error.h b/Sources/c_snikket/iinclude/include/haxe/io/Error.h
deleted file mode 100644
index 83aadc4..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Error.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Error
-#define INCLUDED_haxe_io_Error
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Error)
-namespace haxe{
-namespace io{
-
-
-class Error_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Error_obj OBJ_;
-
-	public:
-		Error_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("haxe.io.Error",68,16,01,55); }
-		::String __ToString() const { return HX_("Error.",86,f7,fc,85) + _hx_tag; }
-
-		static ::haxe::io::Error Blocked;
-		static inline ::haxe::io::Error Blocked_dyn() { return Blocked; }
-		static ::haxe::io::Error Custom( ::Dynamic e);
-		static ::Dynamic Custom_dyn();
-		static ::haxe::io::Error OutsideBounds;
-		static inline ::haxe::io::Error OutsideBounds_dyn() { return OutsideBounds; }
-		static ::haxe::io::Error Overflow;
-		static inline ::haxe::io::Error Overflow_dyn() { return Overflow; }
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Error */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Input.h b/Sources/c_snikket/iinclude/include/haxe/io/Input.h
deleted file mode 100644
index 8e88cce..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Input.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Input
-#define INCLUDED_haxe_io_Input
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES Input_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Input_obj OBJ_;
-		Input_obj();
-
-	public:
-		enum { _hx_ClassId = 0x19e22056 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.io.Input")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.io.Input"); }
-
-		inline static ::hx::ObjectPtr< Input_obj > __new() {
-			::hx::ObjectPtr< Input_obj > __this = new Input_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Input_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Input_obj *__this = (Input_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Input_obj), false, "haxe.io.Input"));
-			*(void **)__this = Input_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Input_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Input",ea,33,4b,51); }
-
-		bool bigEndian;
-		virtual int readByte();
-		::Dynamic readByte_dyn();
-
-		virtual int readBytes( ::haxe::io::Bytes s,int pos,int len);
-		::Dynamic readBytes_dyn();
-
-		virtual void close();
-		::Dynamic close_dyn();
-
-		bool set_bigEndian(bool b);
-		::Dynamic set_bigEndian_dyn();
-
-		 ::haxe::io::Bytes readAll( ::Dynamic bufsize);
-		::Dynamic readAll_dyn();
-
-		int readInt32();
-		::Dynamic readInt32_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Input */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Output.h b/Sources/c_snikket/iinclude/include/haxe/io/Output.h
deleted file mode 100644
index 7fc6dc3..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Output.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Output
-#define INCLUDED_haxe_io_Output
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Encoding)
-HX_DECLARE_CLASS2(haxe,io,Output)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES Output_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Output_obj OBJ_;
-		Output_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0a55a26d };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.io.Output")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.io.Output"); }
-
-		inline static ::hx::ObjectPtr< Output_obj > __new() {
-			::hx::ObjectPtr< Output_obj > __this = new Output_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Output_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Output_obj *__this = (Output_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Output_obj), false, "haxe.io.Output"));
-			*(void **)__this = Output_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Output_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Output",21,83,15,41); }
-
-		virtual void writeByte(int c);
-		::Dynamic writeByte_dyn();
-
-		virtual int writeBytes( ::haxe::io::Bytes s,int pos,int len);
-		::Dynamic writeBytes_dyn();
-
-		virtual void close();
-		::Dynamic close_dyn();
-
-		void write( ::haxe::io::Bytes s);
-		::Dynamic write_dyn();
-
-		void writeFullBytes( ::haxe::io::Bytes s,int pos,int len);
-		::Dynamic writeFullBytes_dyn();
-
-		void prepare(int nbytes);
-		::Dynamic prepare_dyn();
-
-		void writeString(::String s, ::haxe::io::Encoding encoding);
-		::Dynamic writeString_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Output */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/io/Path.h b/Sources/c_snikket/iinclude/include/haxe/io/Path.h
deleted file mode 100644
index c3b75d8..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/io/Path.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_io_Path
-#define INCLUDED_haxe_io_Path
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Path)
-
-namespace haxe{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES Path_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Path_obj OBJ_;
-		Path_obj();
-
-	public:
-		enum { _hx_ClassId = 0x026896d9 };
-
-		void __construct(::String path);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.io.Path")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.io.Path"); }
-		static ::hx::ObjectPtr< Path_obj > __new(::String path);
-		static ::hx::ObjectPtr< Path_obj > __alloc(::hx::Ctx *_hx_ctx,::String path);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Path_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Path",c5,11,2b,35); }
-
-		static ::String withoutDirectory(::String path);
-		static ::Dynamic withoutDirectory_dyn();
-
-		static ::String join(::Array< ::String > paths);
-		static ::Dynamic join_dyn();
-
-		static ::String normalize(::String path);
-		static ::Dynamic normalize_dyn();
-
-		static ::String addTrailingSlash(::String path);
-		static ::Dynamic addTrailingSlash_dyn();
-
-		static ::String removeTrailingSlashes(::String path);
-		static ::Dynamic removeTrailingSlashes_dyn();
-
-		static bool isAbsolute(::String path);
-		static ::Dynamic isAbsolute_dyn();
-
-		::String dir;
-		::String file;
-		::String ext;
-		bool backslash;
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace io
-
-#endif /* INCLUDED_haxe_io_Path */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/iterators/ArrayIterator.h b/Sources/c_snikket/iinclude/include/haxe/iterators/ArrayIterator.h
deleted file mode 100644
index 15325b9..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/iterators/ArrayIterator.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_iterators_ArrayIterator
-#define INCLUDED_haxe_iterators_ArrayIterator
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_44ded26575b0f4de_28_new)
-HX_DECLARE_CLASS2(haxe,iterators,ArrayIterator)
-
-namespace haxe{
-namespace iterators{
-
-
-class HXCPP_CLASS_ATTRIBUTES ArrayIterator_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ArrayIterator_obj OBJ_;
-		ArrayIterator_obj();
-
-	public:
-		enum { _hx_ClassId = 0x189859c8 };
-
-		void __construct(::cpp::VirtualArray array);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.iterators.ArrayIterator")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.iterators.ArrayIterator"); }
-
-		inline static ::hx::ObjectPtr< ArrayIterator_obj > __new(::cpp::VirtualArray array) {
-			::hx::ObjectPtr< ArrayIterator_obj > __this = new ArrayIterator_obj();
-			__this->__construct(array);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< ArrayIterator_obj > __alloc(::hx::Ctx *_hx_ctx,::cpp::VirtualArray array) {
-			ArrayIterator_obj *__this = (ArrayIterator_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ArrayIterator_obj), true, "haxe.iterators.ArrayIterator"));
-			*(void **)__this = ArrayIterator_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_44ded26575b0f4de_28_new)
-HXLINE(  30)		( ( ::haxe::iterators::ArrayIterator)(__this) )->current = 0;
-HXLINE(  37)		( ( ::haxe::iterators::ArrayIterator)(__this) )->array = array;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ArrayIterator_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ArrayIterator",87,84,c8,5d); }
-
-		::cpp::VirtualArray array;
-		int current;
-		bool hasNext();
-		::Dynamic hasNext_dyn();
-
-		 ::Dynamic next();
-		::Dynamic next_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace iterators
-
-#endif /* INCLUDED_haxe_iterators_ArrayIterator */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/iterators/MapKeyValueIterator.h b/Sources/c_snikket/iinclude/include/haxe/iterators/MapKeyValueIterator.h
deleted file mode 100644
index 22cf306..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/iterators/MapKeyValueIterator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_iterators_MapKeyValueIterator
-#define INCLUDED_haxe_iterators_MapKeyValueIterator
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,iterators,MapKeyValueIterator)
-
-namespace haxe{
-namespace iterators{
-
-
-class HXCPP_CLASS_ATTRIBUTES MapKeyValueIterator_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MapKeyValueIterator_obj OBJ_;
-		MapKeyValueIterator_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5732dffd };
-
-		void __construct(::Dynamic map);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.iterators.MapKeyValueIterator")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.iterators.MapKeyValueIterator"); }
-		static ::hx::ObjectPtr< MapKeyValueIterator_obj > __new(::Dynamic map);
-		static ::hx::ObjectPtr< MapKeyValueIterator_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic map);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MapKeyValueIterator_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MapKeyValueIterator",fc,23,62,2c); }
-
-		::Dynamic map;
-		 ::Dynamic keys;
-		bool hasNext();
-		::Dynamic hasNext_dyn();
-
-		 ::Dynamic next();
-		::Dynamic next_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace iterators
-
-#endif /* INCLUDED_haxe_iterators_MapKeyValueIterator */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/xml/Parser.h b/Sources/c_snikket/iinclude/include/haxe/xml/Parser.h
deleted file mode 100644
index b6ef3d6..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/xml/Parser.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_xml_Parser
-#define INCLUDED_haxe_xml_Parser
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Xml)
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS2(haxe,xml,Parser)
-
-namespace haxe{
-namespace xml{
-
-
-class HXCPP_CLASS_ATTRIBUTES Parser_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Parser_obj OBJ_;
-		Parser_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1c6f1730 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="haxe.xml.Parser")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"haxe.xml.Parser"); }
-
-		inline static ::hx::ObjectPtr< Parser_obj > __new() {
-			::hx::ObjectPtr< Parser_obj > __this = new Parser_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Parser_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Parser_obj *__this = (Parser_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Parser_obj), false, "haxe.xml.Parser"));
-			*(void **)__this = Parser_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Parser_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Parser",ff,10,1d,22); }
-
-		static void __boot();
-		static  ::haxe::ds::StringMap escapes;
-		static  ::Xml parse(::String str,::hx::Null< bool >  strict);
-		static ::Dynamic parse_dyn();
-
-		static int doParse(::String str,bool strict,::hx::Null< int >  p, ::Xml parent);
-		static ::Dynamic doParse_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace xml
-
-#endif /* INCLUDED_haxe_xml_Parser */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/xml/Printer.h b/Sources/c_snikket/iinclude/include/haxe/xml/Printer.h
deleted file mode 100644
index 5b159a1..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/xml/Printer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_xml_Printer
-#define INCLUDED_haxe_xml_Printer
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(StringBuf)
-HX_DECLARE_CLASS0(Xml)
-HX_DECLARE_CLASS2(haxe,xml,Printer)
-
-namespace haxe{
-namespace xml{
-
-
-class HXCPP_CLASS_ATTRIBUTES Printer_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Printer_obj OBJ_;
-		Printer_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5ef86269 };
-
-		void __construct(bool pretty);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.xml.Printer")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.xml.Printer"); }
-		static ::hx::ObjectPtr< Printer_obj > __new(bool pretty);
-		static ::hx::ObjectPtr< Printer_obj > __alloc(::hx::Ctx *_hx_ctx,bool pretty);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Printer_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Printer",ba,fd,84,51); }
-
-		static ::String print( ::Xml xml, ::Dynamic pretty);
-		static ::Dynamic print_dyn();
-
-		 ::StringBuf output;
-		bool pretty;
-		void writeNode( ::Xml value,::String tabs);
-		::Dynamic writeNode_dyn();
-
-		bool hasChildren( ::Xml value);
-		::Dynamic hasChildren_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace xml
-
-#endif /* INCLUDED_haxe_xml_Printer */ 
diff --git a/Sources/c_snikket/iinclude/include/haxe/xml/XmlParserException.h b/Sources/c_snikket/iinclude/include/haxe/xml/XmlParserException.h
deleted file mode 100644
index a842951..0000000
--- a/Sources/c_snikket/iinclude/include/haxe/xml/XmlParserException.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_haxe_xml_XmlParserException
-#define INCLUDED_haxe_xml_XmlParserException
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,xml,XmlParserException)
-
-namespace haxe{
-namespace xml{
-
-
-class HXCPP_CLASS_ATTRIBUTES XmlParserException_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef XmlParserException_obj OBJ_;
-		XmlParserException_obj();
-
-	public:
-		enum { _hx_ClassId = 0x75f2332a };
-
-		void __construct(::String message,::String xml,int position);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.xml.XmlParserException")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.xml.XmlParserException"); }
-		static ::hx::ObjectPtr< XmlParserException_obj > __new(::String message,::String xml,int position);
-		static ::hx::ObjectPtr< XmlParserException_obj > __alloc(::hx::Ctx *_hx_ctx,::String message,::String xml,int position);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~XmlParserException_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("XmlParserException",79,27,d7,6b); }
-
-		::String message;
-		int lineNumber;
-		int positionAtLine;
-		int position;
-		::String xml;
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace haxe
-} // end namespace xml
-
-#endif /* INCLUDED_haxe_xml_XmlParserException */ 
diff --git a/Sources/c_snikket/iinclude/include/hsluv/Hsluv.h b/Sources/c_snikket/iinclude/include/hsluv/Hsluv.h
deleted file mode 100644
index f90390a..0000000
--- a/Sources/c_snikket/iinclude/include/hsluv/Hsluv.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_hsluv_Hsluv
-#define INCLUDED_hsluv_Hsluv
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(hsluv,Hsluv)
-
-namespace hsluv{
-
-
-class HXCPP_CLASS_ATTRIBUTES Hsluv_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Hsluv_obj OBJ_;
-		Hsluv_obj();
-
-	public:
-		enum { _hx_ClassId = 0x29e47ee8 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="hsluv.Hsluv")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"hsluv.Hsluv"); }
-		static ::hx::ObjectPtr< Hsluv_obj > __new();
-		static ::hx::ObjectPtr< Hsluv_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Hsluv_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Hsluv",82,a7,2f,c1); }
-
-		static void __boot();
-		static ::String hexChars;
-		static Float refY;
-		static Float refU;
-		static Float refV;
-		static Float kappa;
-		static Float epsilon;
-		static Float m_r0;
-		static Float m_r1;
-		static Float m_r2;
-		static Float m_g0;
-		static Float m_g1;
-		static Float m_g2;
-		static Float m_b0;
-		static Float m_b1;
-		static Float m_b2;
-		static Float fromLinear(Float c);
-		static ::Dynamic fromLinear_dyn();
-
-		static Float lToY(Float L);
-		static ::Dynamic lToY_dyn();
-
-		static ::String rgbChannelToHex(Float chan);
-		static ::Dynamic rgbChannelToHex_dyn();
-
-		static Float distanceFromOriginAngle(Float slope,Float intercept,Float angle);
-		static ::Dynamic distanceFromOriginAngle_dyn();
-
-		static Float min6(Float f1,Float f2,Float f3,Float f4,Float f5,Float f6);
-		static ::Dynamic min6_dyn();
-
-		::String hex;
-		Float rgb_r;
-		Float rgb_g;
-		Float rgb_b;
-		Float xyz_x;
-		Float xyz_y;
-		Float xyz_z;
-		Float luv_l;
-		Float luv_u;
-		Float luv_v;
-		Float lch_l;
-		Float lch_c;
-		Float lch_h;
-		Float hsluv_h;
-		Float hsluv_s;
-		Float hsluv_l;
-		Float r0s;
-		Float r0i;
-		Float r1s;
-		Float r1i;
-		Float g0s;
-		Float g0i;
-		Float g1s;
-		Float g1i;
-		Float b0s;
-		Float b0i;
-		Float b1s;
-		Float b1i;
-		void rgbToHex();
-		::Dynamic rgbToHex_dyn();
-
-		void xyzToRgb();
-		::Dynamic xyzToRgb_dyn();
-
-		void luvToXyz();
-		::Dynamic luvToXyz_dyn();
-
-		void lchToLuv();
-		::Dynamic lchToLuv_dyn();
-
-		void calculateBoundingLines(Float l);
-		::Dynamic calculateBoundingLines_dyn();
-
-		Float calcMaxChromaHsluv(Float h);
-		::Dynamic calcMaxChromaHsluv_dyn();
-
-		void hsluvToLch();
-		::Dynamic hsluvToLch_dyn();
-
-		void hsluvToRgb();
-		::Dynamic hsluvToRgb_dyn();
-
-		void hsluvToHex();
-		::Dynamic hsluvToHex_dyn();
-
-};
-
-} // end namespace hsluv
-
-#endif /* INCLUDED_hsluv_Hsluv */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlAttribute.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlAttribute.h
deleted file mode 100644
index f473c92..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlAttribute.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlAttribute
-#define INCLUDED_htmlparser_HtmlAttribute
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_630f17b70ccedfe6_10_new)
-HX_DECLARE_CLASS1(htmlparser,HtmlAttribute)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlAttribute_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HtmlAttribute_obj OBJ_;
-		HtmlAttribute_obj();
-
-	public:
-		enum { _hx_ClassId = 0x49e2a647 };
-
-		void __construct(::String name,::String value,::String quote);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="htmlparser.HtmlAttribute")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"htmlparser.HtmlAttribute"); }
-
-		inline static ::hx::ObjectPtr< HtmlAttribute_obj > __new(::String name,::String value,::String quote) {
-			::hx::ObjectPtr< HtmlAttribute_obj > __this = new HtmlAttribute_obj();
-			__this->__construct(name,value,quote);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HtmlAttribute_obj > __alloc(::hx::Ctx *_hx_ctx,::String name,::String value,::String quote) {
-			HtmlAttribute_obj *__this = (HtmlAttribute_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HtmlAttribute_obj), true, "htmlparser.HtmlAttribute"));
-			*(void **)__this = HtmlAttribute_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_630f17b70ccedfe6_10_new)
-HXLINE(  11)		( ( ::htmlparser::HtmlAttribute)(__this) )->name = name;
-HXLINE(  12)		( ( ::htmlparser::HtmlAttribute)(__this) )->value = value;
-HXLINE(  13)		( ( ::htmlparser::HtmlAttribute)(__this) )->quote = quote;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlAttribute_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlAttribute",11,85,c2,03); }
-
-		::String name;
-		::String value;
-		::String quote;
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlAttribute */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlNode.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlNode.h
deleted file mode 100644
index 2b2ab6c..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlNode.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlNode
-#define INCLUDED_htmlparser_HtmlNode
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(htmlparser,HtmlNode)
-HX_DECLARE_CLASS1(htmlparser,HtmlNodeElement)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlNode_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HtmlNode_obj OBJ_;
-		HtmlNode_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0ca65a7f };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="htmlparser.HtmlNode")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"htmlparser.HtmlNode"); }
-
-		inline static ::hx::ObjectPtr< HtmlNode_obj > __new() {
-			::hx::ObjectPtr< HtmlNode_obj > __this = new HtmlNode_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HtmlNode_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			HtmlNode_obj *__this = (HtmlNode_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HtmlNode_obj), true, "htmlparser.HtmlNode"));
-			*(void **)__this = HtmlNode_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlNode_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlNode",2d,19,fa,e5); }
-
-		 ::htmlparser::HtmlNodeElement parent;
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlNode */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlNodeElement.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlNodeElement.h
deleted file mode 100644
index 6960292..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlNodeElement.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlNodeElement
-#define INCLUDED_htmlparser_HtmlNodeElement
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_htmlparser_HtmlNode
-#include <htmlparser/HtmlNode.h>
-#endif
-HX_DECLARE_CLASS1(htmlparser,HtmlAttribute)
-HX_DECLARE_CLASS1(htmlparser,HtmlNode)
-HX_DECLARE_CLASS1(htmlparser,HtmlNodeElement)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlNodeElement_obj : public  ::htmlparser::HtmlNode_obj
-{
-	public:
-		typedef  ::htmlparser::HtmlNode_obj super;
-		typedef HtmlNodeElement_obj OBJ_;
-		HtmlNodeElement_obj();
-
-	public:
-		enum { _hx_ClassId = 0x234247c5 };
-
-		void __construct(::String name,::Array< ::Dynamic> attributes);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="htmlparser.HtmlNodeElement")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"htmlparser.HtmlNodeElement"); }
-		static ::hx::ObjectPtr< HtmlNodeElement_obj > __new(::String name,::Array< ::Dynamic> attributes);
-		static ::hx::ObjectPtr< HtmlNodeElement_obj > __alloc(::hx::Ctx *_hx_ctx,::String name,::Array< ::Dynamic> attributes);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlNodeElement_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlNodeElement",0f,ed,ee,fb); }
-
-		::String name;
-		::Array< ::Dynamic> attributes;
-		::Array< ::Dynamic> nodes;
-		::Array< ::Dynamic> children;
-		void addChild( ::htmlparser::HtmlNode node, ::htmlparser::HtmlNode beforeNode);
-		::Dynamic addChild_dyn();
-
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlNodeElement */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlNodeText.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlNodeText.h
deleted file mode 100644
index 82be3b5..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlNodeText.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlNodeText
-#define INCLUDED_htmlparser_HtmlNodeText
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_htmlparser_HtmlNode
-#include <htmlparser/HtmlNode.h>
-#endif
-HX_DECLARE_CLASS1(htmlparser,HtmlNode)
-HX_DECLARE_CLASS1(htmlparser,HtmlNodeText)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlNodeText_obj : public  ::htmlparser::HtmlNode_obj
-{
-	public:
-		typedef  ::htmlparser::HtmlNode_obj super;
-		typedef HtmlNodeText_obj OBJ_;
-		HtmlNodeText_obj();
-
-	public:
-		enum { _hx_ClassId = 0x699e2404 };
-
-		void __construct(::String text);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="htmlparser.HtmlNodeText")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"htmlparser.HtmlNodeText"); }
-		static ::hx::ObjectPtr< HtmlNodeText_obj > __new(::String text);
-		static ::hx::ObjectPtr< HtmlNodeText_obj > __alloc(::hx::Ctx *_hx_ctx,::String text);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlNodeText_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlNodeText",7a,ac,55,90); }
-
-		::String text;
-		::String toText();
-		::Dynamic toText_dyn();
-
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlNodeText */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlParser.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlParser.h
deleted file mode 100644
index 88c417e..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlParser.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlParser
-#define INCLUDED_htmlparser_HtmlParser
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(EReg)
-HX_DECLARE_CLASS1(htmlparser,HtmlAttribute)
-HX_DECLARE_CLASS1(htmlparser,HtmlNode)
-HX_DECLARE_CLASS1(htmlparser,HtmlNodeElement)
-HX_DECLARE_CLASS1(htmlparser,HtmlParser)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlParser_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HtmlParser_obj OBJ_;
-		HtmlParser_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0d37c69c };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="htmlparser.HtmlParser")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"htmlparser.HtmlParser"); }
-		static ::hx::ObjectPtr< HtmlParser_obj > __new();
-		static ::hx::ObjectPtr< HtmlParser_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlParser_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlParser",ca,0c,fb,b1); }
-
-		static void __boot();
-		static  ::Dynamic SELF_CLOSING_TAGS_HTML;
-		static ::String reID;
-		static ::String reNamespacedID;
-		static ::String reCDATA;
-		static ::String reScript;
-		static ::String reStyle;
-		static ::String reElementOpen;
-		static ::String reAttr;
-		static ::String reElementEnd;
-		static ::String reElementClose;
-		static ::String reComment;
-		static  ::EReg reMain;
-		static  ::EReg reParseAttrs;
-		static ::Array< ::Dynamic> run(::String str,::hx::Null< bool >  tolerant);
-		static ::Dynamic run_dyn();
-
-		static ::Array< ::Dynamic> parseAttrs(::String str);
-		static ::Dynamic parseAttrs_dyn();
-
-		bool tolerant;
-		::Array< ::Dynamic> matches;
-		::String str;
-		int i;
-		::Array< ::Dynamic> parse(::String str,::hx::Null< bool >  tolerant);
-		::Dynamic parse_dyn();
-
-		 ::Dynamic processMatches(::Array< ::String > openedTagsLC);
-		::Dynamic processMatches_dyn();
-
-		 ::Dynamic parseElement(::Array< ::String > openedTagsLC);
-		::Dynamic parseElement_dyn();
-
-		bool isSelfClosingTag(::String tag);
-		::Dynamic isSelfClosingTag_dyn();
-
-		 ::htmlparser::HtmlNodeElement newElement(::String name,::Array< ::Dynamic> attributes);
-		::Dynamic newElement_dyn();
-
-		 ::Dynamic getPosition(int matchIndex);
-		::Dynamic getPosition_dyn();
-
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlParser */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlParserException.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlParserException.h
deleted file mode 100644
index e32202a..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlParserException.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlParserException
-#define INCLUDED_htmlparser_HtmlParserException
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_8ec4e8a8c4e51446_12_new)
-HX_DECLARE_CLASS1(htmlparser,HtmlParserException)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlParserException_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HtmlParserException_obj OBJ_;
-		HtmlParserException_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0872044b };
-
-		void __construct(::String message, ::Dynamic pos);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="htmlparser.HtmlParserException")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"htmlparser.HtmlParserException"); }
-
-		inline static ::hx::ObjectPtr< HtmlParserException_obj > __new(::String message, ::Dynamic pos) {
-			::hx::ObjectPtr< HtmlParserException_obj > __this = new HtmlParserException_obj();
-			__this->__construct(message,pos);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HtmlParserException_obj > __alloc(::hx::Ctx *_hx_ctx,::String message, ::Dynamic pos) {
-			HtmlParserException_obj *__this = (HtmlParserException_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HtmlParserException_obj), true, "htmlparser.HtmlParserException"));
-			*(void **)__this = HtmlParserException_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_8ec4e8a8c4e51446_12_new)
-HXLINE(  13)		( ( ::htmlparser::HtmlParserException)(__this) )->message = message;
-HXLINE(  15)		( ( ::htmlparser::HtmlParserException)(__this) )->line = ( (int)(pos->__Field(HX_("line",f4,17,b3,47),::hx::paccDynamic)) );
-HXLINE(  16)		( ( ::htmlparser::HtmlParserException)(__this) )->column = ( (int)(pos->__Field(HX_("column",d6,4e,8b,c6),::hx::paccDynamic)) );
-HXLINE(  17)		( ( ::htmlparser::HtmlParserException)(__this) )->length = ( (int)(pos->__Field(HX_("length",e6,94,07,9f),::hx::paccDynamic)) );
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlParserException_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlParserException",25,fa,72,da); }
-
-		::String message;
-		int line;
-		int column;
-		int length;
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlParserException */ 
diff --git a/Sources/c_snikket/iinclude/include/htmlparser/HtmlTools.h b/Sources/c_snikket/iinclude/include/htmlparser/HtmlTools.h
deleted file mode 100644
index a082fb8..0000000
--- a/Sources/c_snikket/iinclude/include/htmlparser/HtmlTools.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_htmlparser_HtmlTools
-#define INCLUDED_htmlparser_HtmlTools
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(htmlparser,HtmlTools)
-
-namespace htmlparser{
-
-
-class HXCPP_CLASS_ATTRIBUTES HtmlTools_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HtmlTools_obj OBJ_;
-		HtmlTools_obj();
-
-	public:
-		enum { _hx_ClassId = 0x319122e2 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="htmlparser.HtmlTools")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"htmlparser.HtmlTools"); }
-
-		inline static ::hx::ObjectPtr< HtmlTools_obj > __new() {
-			::hx::ObjectPtr< HtmlTools_obj > __this = new HtmlTools_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HtmlTools_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			HtmlTools_obj *__this = (HtmlTools_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HtmlTools_obj), false, "htmlparser.HtmlTools"));
-			*(void **)__this = HtmlTools_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HtmlTools_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HtmlTools",90,c8,4b,c9); }
-
-		static  ::haxe::ds::StringMap htmlUnescapeMap;
-		static  ::haxe::ds::StringMap get_htmlUnescapeMap();
-		static ::Dynamic get_htmlUnescapeMap_dyn();
-
-		static ::String unescape(::String text);
-		static ::Dynamic unescape_dyn();
-
-};
-
-} // end namespace htmlparser
-
-#endif /* INCLUDED_htmlparser_HtmlTools */ 
diff --git a/Sources/c_snikket/iinclude/include/httpstatus/_HttpStatusMessage/HttpStatusMessage_Impl_.h b/Sources/c_snikket/iinclude/include/httpstatus/_HttpStatusMessage/HttpStatusMessage_Impl_.h
deleted file mode 100644
index dfe9b21..0000000
--- a/Sources/c_snikket/iinclude/include/httpstatus/_HttpStatusMessage/HttpStatusMessage_Impl_.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_httpstatus__HttpStatusMessage_HttpStatusMessage_Impl_
-#define INCLUDED_httpstatus__HttpStatusMessage_HttpStatusMessage_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(httpstatus,_HttpStatusMessage,HttpStatusMessage_Impl_)
-
-namespace httpstatus{
-namespace _HttpStatusMessage{
-
-
-class HXCPP_CLASS_ATTRIBUTES HttpStatusMessage_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HttpStatusMessage_Impl__obj OBJ_;
-		HttpStatusMessage_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x0de4d9f9 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="httpstatus._HttpStatusMessage.HttpStatusMessage_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"httpstatus._HttpStatusMessage.HttpStatusMessage_Impl_"); }
-
-		inline static ::hx::ObjectPtr< HttpStatusMessage_Impl__obj > __new() {
-			::hx::ObjectPtr< HttpStatusMessage_Impl__obj > __this = new HttpStatusMessage_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HttpStatusMessage_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			HttpStatusMessage_Impl__obj *__this = (HttpStatusMessage_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HttpStatusMessage_Impl__obj), false, "httpstatus._HttpStatusMessage.HttpStatusMessage_Impl_"));
-			*(void **)__this = HttpStatusMessage_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HttpStatusMessage_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HttpStatusMessage_Impl_",4d,ec,1b,89); }
-
-		static ::String fromCode(int statusCode);
-		static ::Dynamic fromCode_dyn();
-
-};
-
-} // end namespace httpstatus
-} // end namespace _HttpStatusMessage
-
-#endif /* INCLUDED_httpstatus__HttpStatusMessage_HttpStatusMessage_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/hx/strings/RandomStrings.h b/Sources/c_snikket/iinclude/include/hx/strings/RandomStrings.h
deleted file mode 100644
index ff1c160..0000000
--- a/Sources/c_snikket/iinclude/include/hx/strings/RandomStrings.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_hx_strings_RandomStrings
-#define INCLUDED_hx_strings_RandomStrings
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(hx,strings,RandomStrings)
-HX_DECLARE_CLASS4(hx,strings,internal,_Either2,_Either2)
-
-namespace hx{
-namespace strings{
-
-
-class HXCPP_CLASS_ATTRIBUTES RandomStrings_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef RandomStrings_obj OBJ_;
-		RandomStrings_obj();
-
-	public:
-		enum { _hx_ClassId = 0x48d6a291 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="hx.strings.RandomStrings")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"hx.strings.RandomStrings"); }
-
-		inline static ::hx::ObjectPtr< RandomStrings_obj > __new() {
-			::hx::ObjectPtr< RandomStrings_obj > __this = new RandomStrings_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< RandomStrings_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			RandomStrings_obj *__this = (RandomStrings_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(RandomStrings_obj), false, "hx.strings.RandomStrings"));
-			*(void **)__this = RandomStrings_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~RandomStrings_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("RandomStrings",9f,7a,45,55); }
-
-		static void __boot();
-		static ::Array< int > DIGITS;
-		static ::Array< int > _genAsciiAlpha();
-		static ::Dynamic _genAsciiAlpha_dyn();
-
-		static ::Array< int > ASCII_ALPHA;
-		static ::Array< int > ASCII_ALPHA_NUMERIC;
-		static ::String random(int length, ::hx::strings::internal::_Either2::_Either2 chars);
-		static ::Dynamic random_dyn();
-
-		static ::String randomUUIDv4(::String separator);
-		static ::Dynamic randomUUIDv4_dyn();
-
-};
-
-} // end namespace hx
-} // end namespace strings
-
-#endif /* INCLUDED_hx_strings_RandomStrings */ 
diff --git a/Sources/c_snikket/iinclude/include/hx/strings/StringBuilder.h b/Sources/c_snikket/iinclude/include/hx/strings/StringBuilder.h
deleted file mode 100644
index 8115925..0000000
--- a/Sources/c_snikket/iinclude/include/hx/strings/StringBuilder.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_hx_strings_StringBuilder
-#define INCLUDED_hx_strings_StringBuilder
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(StringBuf)
-HX_DECLARE_CLASS2(hx,strings,StringBuilder)
-
-namespace hx{
-namespace strings{
-
-
-class HXCPP_CLASS_ATTRIBUTES StringBuilder_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StringBuilder_obj OBJ_;
-		StringBuilder_obj();
-
-	public:
-		enum { _hx_ClassId = 0x32066fb8 };
-
-		void __construct(::String initialContent);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="hx.strings.StringBuilder")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"hx.strings.StringBuilder"); }
-		static ::hx::ObjectPtr< StringBuilder_obj > __new(::String initialContent);
-		static ::hx::ObjectPtr< StringBuilder_obj > __alloc(::hx::Ctx *_hx_ctx,::String initialContent);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StringBuilder_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("StringBuilder",2a,56,d0,8d); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		 ::StringBuf sb;
-		::Array< ::String > pre;
-		int len;
-		 ::hx::strings::StringBuilder add(::String item);
-		::Dynamic add_dyn();
-
-		 ::hx::strings::StringBuilder addChar(int ch);
-		::Dynamic addChar_dyn();
-
-		 ::hx::strings::StringBuilder clear();
-		::Dynamic clear_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace hx
-} // end namespace strings
-
-#endif /* INCLUDED_hx_strings_StringBuilder */ 
diff --git a/Sources/c_snikket/iinclude/include/hx/strings/Strings.h b/Sources/c_snikket/iinclude/include/hx/strings/Strings.h
deleted file mode 100644
index 6629ee7..0000000
--- a/Sources/c_snikket/iinclude/include/hx/strings/Strings.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_hx_strings_Strings
-#define INCLUDED_hx_strings_Strings
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(hx,strings,Strings)
-
-namespace hx{
-namespace strings{
-
-
-class HXCPP_CLASS_ATTRIBUTES Strings_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Strings_obj OBJ_;
-		Strings_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0e5b539c };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="hx.strings.Strings")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"hx.strings.Strings"); }
-
-		inline static ::hx::ObjectPtr< Strings_obj > __new() {
-			::hx::ObjectPtr< Strings_obj > __this = new Strings_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Strings_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Strings_obj *__this = (Strings_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Strings_obj), false, "hx.strings.Strings"));
-			*(void **)__this = Strings_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Strings_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Strings",62,b6,44,c6); }
-
-		static ::Array< int > toChars(::String str);
-		static ::Dynamic toChars_dyn();
-
-};
-
-} // end namespace hx
-} // end namespace strings
-
-#endif /* INCLUDED_hx_strings_Strings */ 
diff --git a/Sources/c_snikket/iinclude/include/hx/strings/internal/_Either2/_Either2.h b/Sources/c_snikket/iinclude/include/hx/strings/internal/_Either2/_Either2.h
deleted file mode 100644
index 189b578..0000000
--- a/Sources/c_snikket/iinclude/include/hx/strings/internal/_Either2/_Either2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_hx_strings_internal__Either2__Either2
-#define INCLUDED_hx_strings_internal__Either2__Either2
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS4(hx,strings,internal,_Either2,_Either2)
-namespace hx{
-namespace strings{
-namespace internal{
-namespace _Either2{
-
-
-class _Either2_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef _Either2_obj OBJ_;
-
-	public:
-		_Either2_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("hx.strings.internal._Either2._Either2",07,08,e6,82); }
-		::String __ToString() const { return HX_("_Either2.",c0,d7,a7,46) + _hx_tag; }
-
-		static ::hx::strings::internal::_Either2::_Either2 a( ::Dynamic v);
-		static ::Dynamic a_dyn();
-		static ::hx::strings::internal::_Either2::_Either2 b( ::Dynamic v);
-		static ::Dynamic b_dyn();
-};
-
-} // end namespace hx
-} // end namespace strings
-} // end namespace internal
-} // end namespace _Either2
-
-#endif /* INCLUDED_hx_strings_internal__Either2__Either2 */ 
diff --git a/Sources/c_snikket/iinclude/include/sha/Hash.h b/Sources/c_snikket/iinclude/include/sha/Hash.h
deleted file mode 100644
index 105a34b..0000000
--- a/Sources/c_snikket/iinclude/include/sha/Hash.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sha_Hash
-#define INCLUDED_sha_Hash
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS1(sha,Hash)
-
-namespace sha{
-
-
-class HXCPP_CLASS_ATTRIBUTES Hash_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Hash_obj OBJ_;
-		Hash_obj();
-
-	public:
-		enum { _hx_ClassId = 0x49a7eb1a };
-
-		void __construct(int blockSize,int finalSize);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sha.Hash")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sha.Hash"); }
-
-		//~Hash_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Hash",ee,5b,e1,2f); }
-
-		int finalSize;
-		int length;
-		 ::haxe::io::Bytes block;
-		 ::sha::Hash update( ::haxe::io::Bytes data);
-		::Dynamic update_dyn();
-
-		 ::haxe::io::Bytes digest();
-		::Dynamic digest_dyn();
-
-		virtual void _update( ::haxe::io::Bytes data) {}
-		::Dynamic _update_dyn();
-		virtual  ::haxe::io::Bytes _hash() { return 0; }
-		::Dynamic _hash_dyn();
-};
-
-} // end namespace sha
-
-#endif /* INCLUDED_sha_Hash */ 
diff --git a/Sources/c_snikket/iinclude/include/sha/SHA256.h b/Sources/c_snikket/iinclude/include/sha/SHA256.h
deleted file mode 100644
index 28722a8..0000000
--- a/Sources/c_snikket/iinclude/include/sha/SHA256.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sha_SHA256
-#define INCLUDED_sha_SHA256
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_sha_Hash
-#include <sha/Hash.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS1(sha,Hash)
-HX_DECLARE_CLASS1(sha,SHA256)
-
-namespace sha{
-
-
-class HXCPP_CLASS_ATTRIBUTES SHA256_obj : public  ::sha::Hash_obj
-{
-	public:
-		typedef  ::sha::Hash_obj super;
-		typedef SHA256_obj OBJ_;
-		SHA256_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0251ab23 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sha.SHA256")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sha.SHA256"); }
-		static ::hx::ObjectPtr< SHA256_obj > __new();
-		static ::hx::ObjectPtr< SHA256_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SHA256_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SHA256",87,b4,95,cf); }
-
-		int _a;
-		int _b;
-		int _c;
-		int _d;
-		int _e;
-		int _f;
-		int _g;
-		int _h;
-		::Array< int > _w;
-		int sigma0(int x);
-		::Dynamic sigma0_dyn();
-
-		int sigma1(int x);
-		::Dynamic sigma1_dyn();
-
-		int gamma0(int x);
-		::Dynamic gamma0_dyn();
-
-		int gamma1(int x);
-		::Dynamic gamma1_dyn();
-
-		int ch(int x,int y,int z);
-		::Dynamic ch_dyn();
-
-		int maj(int x,int y,int z);
-		::Dynamic maj_dyn();
-
-		void _update( ::haxe::io::Bytes data);
-
-		 ::haxe::io::Bytes _hash();
-
-};
-
-} // end namespace sha
-
-#endif /* INCLUDED_sha_SHA256 */ 
diff --git a/Sources/c_snikket/iinclude/include/sha/_SHA256/SHA256_Fields_.h b/Sources/c_snikket/iinclude/include/sha/_SHA256/SHA256_Fields_.h
deleted file mode 100644
index 3d1d69a..0000000
--- a/Sources/c_snikket/iinclude/include/sha/_SHA256/SHA256_Fields_.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sha__SHA256_SHA256_Fields_
-#define INCLUDED_sha__SHA256_SHA256_Fields_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sha,_SHA256,SHA256_Fields_)
-
-namespace sha{
-namespace _SHA256{
-
-
-class HXCPP_CLASS_ATTRIBUTES SHA256_Fields__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SHA256_Fields__obj OBJ_;
-		SHA256_Fields__obj();
-
-	public:
-		enum { _hx_ClassId = 0x07d39014 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="sha._SHA256.SHA256_Fields_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"sha._SHA256.SHA256_Fields_"); }
-
-		inline static ::hx::ObjectPtr< SHA256_Fields__obj > __new() {
-			::hx::ObjectPtr< SHA256_Fields__obj > __this = new SHA256_Fields__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< SHA256_Fields__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			SHA256_Fields__obj *__this = (SHA256_Fields__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(SHA256_Fields__obj), false, "sha._SHA256.SHA256_Fields_"));
-			*(void **)__this = SHA256_Fields__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SHA256_Fields__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SHA256_Fields_",ae,b0,ef,ea); }
-
-		static void __boot();
-		static ::Array< int > K;
-};
-
-} // end namespace sha
-} // end namespace _SHA256
-
-#endif /* INCLUDED_sha__SHA256_SHA256_Fields_ */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/AttachmentSource.h b/Sources/c_snikket/iinclude/include/snikket/AttachmentSource.h
deleted file mode 100644
index 35e0bb9..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/AttachmentSource.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_AttachmentSource
-#define INCLUDED_snikket_AttachmentSource
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,AttachmentSource)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES AttachmentSource_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef AttachmentSource_obj OBJ_;
-		AttachmentSource_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3b403b17 };
-
-		void __construct(::String path,::String mime);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.AttachmentSource")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.AttachmentSource"); }
-		static ::hx::ObjectPtr< AttachmentSource_obj > __new(::String path,::String mime);
-		static ::hx::ObjectPtr< AttachmentSource_obj > __alloc(::hx::Ctx *_hx_ctx,::String path,::String mime);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~AttachmentSource_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("AttachmentSource",3e,95,3b,6c); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String path;
-		::String path__fromC();
-		::Dynamic path__fromC_dyn();
-
-		::String type;
-		::String type__fromC();
-		::Dynamic type__fromC_dyn();
-
-		::String name;
-		::String name__fromC();
-		::Dynamic name__fromC_dyn();
-
-		int size;
-		int size__fromC();
-		::Dynamic size__fromC_dyn();
-
-		::Dynamic tinkSource();
-		::Dynamic tinkSource_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_AttachmentSource */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Autolink.h b/Sources/c_snikket/iinclude/include/snikket/Autolink.h
deleted file mode 100644
index f244927..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Autolink.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Autolink
-#define INCLUDED_snikket_Autolink
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Autolink)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Autolink_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Autolink_obj OBJ_;
-		Autolink_obj();
-
-	public:
-		enum { _hx_ClassId = 0x257fedc6 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.Autolink")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.Autolink"); }
-
-		inline static ::hx::ObjectPtr< Autolink_obj > __new() {
-			::hx::ObjectPtr< Autolink_obj > __this = new Autolink_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Autolink_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Autolink_obj *__this = (Autolink_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Autolink_obj), false, "snikket.Autolink"));
-			*(void **)__this = Autolink_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Autolink_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Autolink",09,97,b1,19); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static ::String IANA_TOP_LEVEL_DOMAINS;
-		static ::String GOOD_IRI_CHAR;
-		static ::String IP_ADDRESS;
-		static ::String IP6_ADDRESS;
-		static ::String UCS_CHAR;
-		static ::String LABEL_CHAR;
-		static ::String IRI_LABEL;
-		static ::String PUNYCODE_TLD;
-		static ::String PROTOCOL;
-		static ::String WORD_BOUNDARY;
-		static ::String USER_INFO;
-		static ::String PORT_NUMBER;
-		static ::String PATH_CHAR;
-		static ::String PATH_AND_QUERY;
-		static ::String STRICT_TLD;
-		static ::String STRICT_HOST_NAME;
-		static ::String STRICT_DOMAIN_NAME;
-		static ::String RELAXED_DOMAIN_NAME;
-		static ::String WEB_URL_WITHOUT_PROTOCOL;
-		static ::String WEB_URL_WITH_PROTOCOL;
-		static ::String AUTOLINK_WEB_URL;
-		static ::String TEL_URI;
-		static ::String SMS_URI;
-		static ::String XMPP_URI;
-		static  ::Dynamic one(::String s,int start);
-		static ::Dynamic one_dyn();
-
-		static  ::Dynamic match(::String s,int start,::String pattern,bool addHttps);
-		static ::Dynamic match_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Autolink */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/AvailableChat.h b/Sources/c_snikket/iinclude/include/snikket/AvailableChat.h
deleted file mode 100644
index 80ae01e..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/AvailableChat.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_AvailableChat
-#define INCLUDED_snikket_AvailableChat
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,AvailableChat)
-HX_DECLARE_CLASS1(snikket,Caps)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES AvailableChat_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef AvailableChat_obj OBJ_;
-		AvailableChat_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7aa46944 };
-
-		void __construct(::String chatId,::String displayName,::String note, ::snikket::Caps caps);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.AvailableChat")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.AvailableChat"); }
-		static ::hx::ObjectPtr< AvailableChat_obj > __new(::String chatId,::String displayName,::String note, ::snikket::Caps caps);
-		static ::hx::ObjectPtr< AvailableChat_obj > __alloc(::hx::Ctx *_hx_ctx,::String chatId,::String displayName,::String note, ::snikket::Caps caps);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~AvailableChat_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("AvailableChat",21,4d,b7,ce); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String chatId;
-		::String chatId__fromC();
-		::Dynamic chatId__fromC_dyn();
-
-		::String displayName;
-		::String displayName__fromC();
-		::Dynamic displayName__fromC_dyn();
-
-		::String note;
-		::String note__fromC();
-		::Dynamic note__fromC_dyn();
-
-		 ::snikket::Caps caps;
-		bool isChannel();
-		::Dynamic isChannel_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_AvailableChat */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Builder.h b/Sources/c_snikket/iinclude/include/snikket/Builder.h
deleted file mode 100644
index 2b371f1..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Builder.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Builder
-#define INCLUDED_snikket_Builder
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Builder)
-HX_DECLARE_CLASS1(snikket,Symbol)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Builder_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Builder_obj OBJ_;
-		Builder_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7b0e9a2a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Builder")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Builder"); }
-		static ::hx::ObjectPtr< Builder_obj > __new();
-		static ::hx::ObjectPtr< Builder_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Builder_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Builder",fb,02,0c,3d); }
-
-		static bool isMerger(int codepoint);
-		static ::Dynamic isMerger_dyn();
-
-		::Array< int > codepoints;
-		bool offer(int codepoint);
-		::Dynamic offer_dyn();
-
-		 ::snikket::Symbol build();
-		::Dynamic build_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Builder */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Caps.h b/Sources/c_snikket/iinclude/include/snikket/Caps.h
deleted file mode 100644
index 908402f..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Caps.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Caps
-#define INCLUDED_snikket_Caps
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Hash)
-HX_DECLARE_CLASS1(snikket,Identity)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Caps_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Caps_obj OBJ_;
-		Caps_obj();
-
-	public:
-		enum { _hx_ClassId = 0x02663c7e };
-
-		void __construct(::String node,::Array< ::Dynamic> identities,::Array< ::String > features);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Caps")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Caps"); }
-		static ::hx::ObjectPtr< Caps_obj > __new(::String node,::Array< ::Dynamic> identities,::Array< ::String > features);
-		static ::hx::ObjectPtr< Caps_obj > __alloc(::hx::Ctx *_hx_ctx,::String node,::Array< ::Dynamic> identities,::Array< ::String > features);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Caps_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Caps",41,48,93,2c); }
-
-		static ::Array< ::String > withIdentity( ::Dynamic caps,::String category,::String type);
-		static ::Dynamic withIdentity_dyn();
-
-		static ::Array< ::String > withFeature( ::Dynamic caps,::String feature);
-		static ::Dynamic withFeature_dyn();
-
-		::String node;
-		::Array< ::Dynamic> identities;
-		::Array< ::String > features;
-		 ::snikket::Hash _ver;
-		bool isChannel(::String chatId);
-		::Dynamic isChannel_dyn();
-
-		 ::snikket::Stanza discoReply();
-		::Dynamic discoReply_dyn();
-
-		 ::snikket::Stanza addC( ::snikket::Stanza stanza);
-		::Dynamic addC_dyn();
-
-		 ::snikket::Hash computeVer();
-		::Dynamic computeVer_dyn();
-
-		 ::snikket::Hash verRaw();
-		::Dynamic verRaw_dyn();
-
-		::String ver();
-		::Dynamic ver_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Caps */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Channel.h b/Sources/c_snikket/iinclude/include/snikket/Channel.h
deleted file mode 100644
index 74066bc..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Channel.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Channel
-#define INCLUDED_snikket_Channel
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_Chat
-#include <snikket/Chat.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Channel)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,MessageSync)
-HX_DECLARE_CLASS1(snikket,Participant)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,Presence)
-HX_DECLARE_CLASS1(snikket,Reaction)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Channel_obj : public  ::snikket::Chat_obj
-{
-	public:
-		typedef  ::snikket::Chat_obj super;
-		typedef Channel_obj OBJ_;
-		Channel_obj();
-
-	public:
-		enum { _hx_ClassId = 0x23f2b886 };
-
-		void __construct( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy, ::snikket::Caps disco);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Channel")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Channel"); }
-		static ::hx::ObjectPtr< Channel_obj > __new( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy, ::snikket::Caps disco);
-		static ::hx::ObjectPtr< Channel_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy, ::snikket::Caps disco);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Channel_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Channel",a3,28,23,9a); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		 ::snikket::Caps disco;
-		bool inSync;
-		 ::snikket::MessageSync sync;
-		bool forceLive;
-		::String _nickInUse;
-		void selfPing(bool refresh);
-		::Dynamic selfPing_dyn();
-
-		void join();
-		::Dynamic join_dyn();
-
-		void selfPingSuccess();
-		::Dynamic selfPingSuccess_dyn();
-
-		void setPresence(::String resource, ::snikket::Presence presence);
-
-		void doSync(::String lastId);
-		::Dynamic doSync_dyn();
-
-		bool isTrusted();
-
-		bool isPrivate();
-		::Dynamic isPrivate_dyn();
-
-		void refreshDisco( ::Dynamic callback);
-		::Dynamic refreshDisco_dyn();
-
-		::String preview();
-
-		bool livePresence();
-
-		bool syncing();
-
-		bool canAudioCall();
-
-		bool canVideoCall();
-
-		::String nickInUse();
-		::Dynamic nickInUse_dyn();
-
-		 ::snikket::JID getFullJid();
-		::Dynamic getFullJid_dyn();
-
-		::Array< ::String > getParticipants();
-
-		 ::snikket::Participant getParticipantDetails(::String participantId);
-
-		void getMessagesBefore(::String beforeId,::String beforeTime, ::Dynamic handler);
-
-		void getMessagesAfter(::String afterId,::String afterTime, ::Dynamic handler);
-
-		void getMessagesAround(::String aroundId,::String aroundTime, ::Dynamic handler);
-
-		 ::snikket::ChatMessageBuilder prepareIncomingMessage( ::snikket::ChatMessageBuilder message, ::snikket::Stanza stanza);
-
-		 ::snikket::ChatMessageBuilder prepareOutgoingMessage( ::snikket::ChatMessageBuilder message);
-		::Dynamic prepareOutgoingMessage_dyn();
-
-		void correctMessage(::String localId, ::snikket::ChatMessageBuilder message);
-
-		void sendMessage( ::snikket::ChatMessageBuilder message);
-
-		void removeReaction( ::snikket::ChatMessage m, ::snikket::Reaction reaction);
-
-		::String lastMessageId();
-
-		void markReadUpTo( ::snikket::ChatMessage message);
-
-		void bookmark();
-
-		void sendChatState(::String state,::String threadId);
-
-		void close();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Channel */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Chat.h b/Sources/c_snikket/iinclude/include/snikket/Chat.h
deleted file mode 100644
index 244dff4..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Chat.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Chat
-#define INCLUDED_snikket_Chat
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS1(haxe,Timer)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,MessageSync)
-HX_DECLARE_CLASS1(snikket,Participant)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,Presence)
-HX_DECLARE_CLASS1(snikket,Reaction)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,DTMFSender)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Chat_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Chat_obj OBJ_;
-		Chat_obj();
-
-	public:
-		enum { _hx_ClassId = 0x026b7f35 };
-
-		void __construct( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Chat")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Chat"); }
-
-		//~Chat_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Chat",f8,8a,98,2c); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		 ::snikket::Client client;
-		 ::snikket::GenericStream stream;
-		::Dynamic persistence;
-		::Array< unsigned char > avatarSha1;
-		 ::haxe::ds::StringMap presence;
-		bool trusted;
-		::String chatId;
-		::String chatId__fromC();
-		::Dynamic chatId__fromC_dyn();
-
-		 ::haxe::ds::StringMap jingleSessions;
-		::String displayName;
-		int uiState;
-		int uiState__fromC();
-		::Dynamic uiState__fromC_dyn();
-
-		bool isBlocked;
-		bool isBlocked__fromC();
-		::Dynamic isBlocked__fromC_dyn();
-
-		 ::snikket::Stanza extensions;
-		int _unreadCount;
-		 ::snikket::ChatMessage lastMessage;
-		::String readUpToId;
-		::String readUpToBy;
-		bool isTyping;
-		::String typingThread;
-		 ::haxe::Timer typingTimer;
-		 ::Dynamic isActive;
-		::String activeThread;
-		 ::Dynamic notificationSettings;
-		virtual  ::snikket::ChatMessageBuilder prepareIncomingMessage( ::snikket::ChatMessageBuilder message, ::snikket::Stanza stanza) { return 0; }
-		::Dynamic prepareIncomingMessage_dyn();
-		virtual void getMessagesBefore(::String beforeId,::String beforeTime, ::Dynamic handler) {}
-		::Dynamic getMessagesBefore_dyn();
-		void getMessagesBefore__fromC(::String beforeId,::String beforeTime,::cpp::Function< void  (void**,size_t,void*) > handler,void* handler__context);
-
-		virtual void getMessagesAfter(::String afterId,::String afterTime, ::Dynamic handler) {}
-		::Dynamic getMessagesAfter_dyn();
-		void getMessagesAfter__fromC(::String afterId,::String afterTime,::cpp::Function< void  (void**,size_t,void*) > handler,void* handler__context);
-
-		virtual void getMessagesAround(::String aroundId,::String aroundTime, ::Dynamic handler) {}
-		::Dynamic getMessagesAround_dyn();
-		void getMessagesAround__fromC(::String aroundId,::String aroundTime,::cpp::Function< void  (void**,size_t,void*) > handler,void* handler__context);
-
-		void fetchFromSync( ::snikket::MessageSync sync, ::Dynamic callback);
-		::Dynamic fetchFromSync_dyn();
-
-		virtual void sendMessage( ::snikket::ChatMessageBuilder message) {}
-		::Dynamic sendMessage_dyn();
-		void sendMessage__fromC( ::snikket::ChatMessageBuilder message);
-		::Dynamic sendMessage__fromC_dyn();
-
-		virtual void markReadUpTo( ::snikket::ChatMessage message) {}
-		::Dynamic markReadUpTo_dyn();
-		void markReadUpTo__fromC( ::snikket::ChatMessage message);
-		::Dynamic markReadUpTo__fromC_dyn();
-
-		virtual void bookmark() {}
-		::Dynamic bookmark_dyn();
-		void bookmark__fromC();
-		::Dynamic bookmark__fromC_dyn();
-
-		virtual ::Array< ::String > getParticipants() { return 0; }
-		::Dynamic getParticipants_dyn();
-		size_t getParticipants__fromC(const char*** outPtr);
-
-		virtual  ::snikket::Participant getParticipantDetails(::String participantId) { return 0; }
-		::Dynamic getParticipantDetails_dyn();
-		 ::snikket::Participant getParticipantDetails__fromC(::String participantId);
-		::Dynamic getParticipantDetails__fromC_dyn();
-
-		virtual void correctMessage(::String localId, ::snikket::ChatMessageBuilder message) {}
-		::Dynamic correctMessage_dyn();
-		void correctMessage__fromC(::String localId, ::snikket::ChatMessageBuilder message);
-		::Dynamic correctMessage__fromC_dyn();
-
-		void addReaction( ::snikket::ChatMessage m, ::snikket::Reaction reaction);
-		::Dynamic addReaction_dyn();
-
-		virtual void removeReaction( ::snikket::ChatMessage m, ::snikket::Reaction reaction) {}
-		::Dynamic removeReaction_dyn();
-		void removeReaction__fromC( ::snikket::ChatMessage m, ::snikket::Reaction reaction);
-		::Dynamic removeReaction__fromC_dyn();
-
-		virtual void sendChatState(::String state,::String threadId) {}
-		::Dynamic sendChatState_dyn();
-		void typing(::String threadId,::String content);
-		::Dynamic typing_dyn();
-
-		void setActive(bool active,::String threadId);
-		::Dynamic setActive_dyn();
-
-		virtual void close() {}
-		::Dynamic close_dyn();
-		void close__fromC();
-		::Dynamic close__fromC_dyn();
-
-		void togglePinned();
-		::Dynamic togglePinned_dyn();
-
-		void block( ::snikket::ChatMessage reportSpam,bool onServer);
-		::Dynamic block_dyn();
-
-		void unblock(bool onServer);
-		::Dynamic unblock_dyn();
-
-		void setNotifications(bool filtered,bool mention,bool reply);
-		::Dynamic setNotifications_dyn();
-
-		bool notificationsFiltered();
-		::Dynamic notificationsFiltered_dyn();
-
-		bool notifyMention();
-		::Dynamic notifyMention_dyn();
-
-		bool notifyReply();
-		::Dynamic notifyReply_dyn();
-
-		virtual ::String lastMessageId() { return 0; }
-		::Dynamic lastMessageId_dyn();
-		::String lastMessageId__fromC();
-		::Dynamic lastMessageId__fromC_dyn();
-
-		::String lastMessageTimestamp();
-		::Dynamic lastMessageTimestamp_dyn();
-
-		void updateFromBookmark( ::snikket::Stanza item);
-		::Dynamic updateFromBookmark_dyn();
-
-		void updateFromRoster( ::Dynamic item);
-		::Dynamic updateFromRoster_dyn();
-
-		::String getPhoto();
-		::Dynamic getPhoto_dyn();
-
-		::String getPlaceholder();
-		::Dynamic getPlaceholder_dyn();
-
-		::String readUpTo();
-		::Dynamic readUpTo_dyn();
-
-		int unreadCount();
-		::Dynamic unreadCount_dyn();
-
-		void setUnreadCount(int count);
-		::Dynamic setUnreadCount_dyn();
-
-		virtual ::String preview();
-		::Dynamic preview_dyn();
-
-		void setLastMessage( ::snikket::ChatMessage message);
-		::Dynamic setLastMessage_dyn();
-
-		void setDisplayName(::String fn);
-		::Dynamic setDisplayName_dyn();
-
-		::String getDisplayName();
-		::Dynamic getDisplayName_dyn();
-
-		virtual void setPresence(::String resource, ::snikket::Presence presence);
-		::Dynamic setPresence_dyn();
-
-		void setCaps(::String resource, ::snikket::Caps caps);
-		::Dynamic setCaps_dyn();
-
-		void removePresence(::String resource);
-		::Dynamic removePresence_dyn();
-
-		 ::Dynamic getCaps();
-		::Dynamic getCaps_dyn();
-
-		 ::snikket::Caps getResourceCaps(::String resource);
-		::Dynamic getResourceCaps_dyn();
-
-		void setAvatarSha1(::Array< unsigned char > sha1);
-		::Dynamic setAvatarSha1_dyn();
-
-		void setTrusted(bool trusted);
-		::Dynamic setTrusted_dyn();
-
-		virtual bool isTrusted();
-		::Dynamic isTrusted_dyn();
-
-		virtual bool livePresence();
-		::Dynamic livePresence_dyn();
-
-		virtual bool syncing();
-		::Dynamic syncing_dyn();
-
-		virtual bool canAudioCall();
-		::Dynamic canAudioCall_dyn();
-
-		virtual bool canVideoCall();
-		::Dynamic canVideoCall_dyn();
-
-		void startCall(bool audio,bool video);
-		::Dynamic startCall_dyn();
-
-		void addMedia(::Array< ::Dynamic> streams);
-		::Dynamic addMedia_dyn();
-
-		void acceptCall();
-		::Dynamic acceptCall_dyn();
-
-		void hangup();
-		::Dynamic hangup_dyn();
-
-		::String callStatus();
-		::Dynamic callStatus_dyn();
-
-		 ::snikket::jingle::DTMFSender dtmf();
-		::Dynamic dtmf_dyn();
-
-		::Array< ::Dynamic> videoTracks();
-		::Dynamic videoTracks_dyn();
-
-		size_t videoTracks__fromC(void*** outPtr);
-
-		void markReadUpToId(::String upTo,::String upToBy, ::Dynamic callback);
-		::Dynamic markReadUpToId_dyn();
-
-		void markReadUpToMessage( ::snikket::ChatMessage message, ::Dynamic callback);
-		::Dynamic markReadUpToMessage_dyn();
-
-		void publishMds();
-		::Dynamic publishMds_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Chat */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/ChatAttachment.h b/Sources/c_snikket/iinclude/include/snikket/ChatAttachment.h
deleted file mode 100644
index a22273b..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/ChatAttachment.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_ChatAttachment
-#define INCLUDED_snikket_ChatAttachment
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,ChatAttachment)
-HX_DECLARE_CLASS1(snikket,Hash)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES ChatAttachment_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ChatAttachment_obj OBJ_;
-		ChatAttachment_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2f907f78 };
-
-		void __construct(::String name,::String mime, ::Dynamic size,::Array< ::String > uris,::Array< ::Dynamic> hashes);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.ChatAttachment")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.ChatAttachment"); }
-		static ::hx::ObjectPtr< ChatAttachment_obj > __new(::String name,::String mime, ::Dynamic size,::Array< ::String > uris,::Array< ::Dynamic> hashes);
-		static ::hx::ObjectPtr< ChatAttachment_obj > __alloc(::hx::Ctx *_hx_ctx,::String name,::String mime, ::Dynamic size,::Array< ::String > uris,::Array< ::Dynamic> hashes);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ChatAttachment_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ChatAttachment",fb,fc,04,6c); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::ChatAttachment create(::String name,::String mime,int size,::String uri);
-		static ::Dynamic create_dyn();
-
-		::String name;
-		::String name__fromC();
-		::Dynamic name__fromC_dyn();
-
-		::String mime;
-		::String mime__fromC();
-		::Dynamic mime__fromC_dyn();
-
-		 ::Dynamic size;
-		 ::Dynamic size__fromC();
-		::Dynamic size__fromC_dyn();
-
-		::Array< ::String > uris;
-		size_t uris__fromC(const char*** outPtr);
-
-		::Array< ::Dynamic> hashes;
-		size_t hashes__fromC(void*** outPtr);
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_ChatAttachment */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/ChatMessage.h b/Sources/c_snikket/iinclude/include/snikket/ChatMessage.h
deleted file mode 100644
index c2531ac..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/ChatMessage.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_ChatMessage
-#define INCLUDED_snikket_ChatMessage
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,ChatAttachment)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,Hash)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES ChatMessage_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ChatMessage_obj OBJ_;
-		ChatMessage_obj();
-
-	public:
-		enum { _hx_ClassId = 0x36665f12 };
-
-		void __construct( ::Dynamic params);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.ChatMessage")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.ChatMessage"); }
-		static ::hx::ObjectPtr< ChatMessage_obj > __new( ::Dynamic params);
-		static ::hx::ObjectPtr< ChatMessage_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic params);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ChatMessage_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ChatMessage",af,a1,2d,18); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::ChatMessage fromStanza( ::snikket::Stanza stanza, ::snikket::JID localJid, ::Dynamic addContext);
-		static ::Dynamic fromStanza_dyn();
-
-		::String localId;
-		::String localId__fromC();
-		::Dynamic localId__fromC_dyn();
-
-		::String serverId;
-		::String serverId__fromC();
-		::Dynamic serverId__fromC_dyn();
-
-		::String serverIdBy;
-		::String serverIdBy__fromC();
-		::Dynamic serverIdBy__fromC_dyn();
-
-		int type;
-		int type__fromC();
-		::Dynamic type__fromC_dyn();
-
-		bool syncPoint;
-		::String replyId;
-		::String timestamp;
-		::String timestamp__fromC();
-		::Dynamic timestamp__fromC_dyn();
-
-		 ::snikket::JID to;
-		 ::snikket::JID from;
-		::Array< ::Dynamic> recipients;
-		::Array< ::Dynamic> replyTo;
-		::String senderId;
-		::String senderId__fromC();
-		::Dynamic senderId__fromC_dyn();
-
-		 ::snikket::ChatMessage replyToMessage;
-		 ::snikket::ChatMessage replyToMessage__fromC();
-		::Dynamic replyToMessage__fromC_dyn();
-
-		::String threadId;
-		::String threadId__fromC();
-		::Dynamic threadId__fromC_dyn();
-
-		::Array< ::Dynamic> attachments;
-		size_t attachments__fromC(void*** outPtr);
-
-		 ::haxe::ds::StringMap reactions;
-		::String text;
-		::String text__fromC();
-		::Dynamic text__fromC_dyn();
-
-		::String lang;
-		::String lang__fromC();
-		::Dynamic lang__fromC_dyn();
-
-		int direction;
-		int direction__fromC();
-		::Dynamic direction__fromC_dyn();
-
-		int status;
-		int status__fromC();
-		::Dynamic status__fromC_dyn();
-
-		void set_status__fromC(int value);
-		::Dynamic set_status__fromC_dyn();
-
-		::Array< ::Dynamic> versions;
-		size_t versions__fromC(void*** outPtr);
-
-		::Array< ::Dynamic> payloads;
-		 ::snikket::Stanza stanza;
-		 ::snikket::ChatMessageBuilder reply();
-		::Dynamic reply_dyn();
-
-		::String getReplyId();
-		::Dynamic getReplyId_dyn();
-
-		 ::snikket::ChatMessage set_replyToMessage( ::snikket::ChatMessage m);
-		::Dynamic set_replyToMessage_dyn();
-
-		 ::haxe::ds::StringMap set_reactions( ::haxe::ds::StringMap r);
-		::Dynamic set_reactions_dyn();
-
-		::Array< ::Dynamic> inlineHashReferences();
-		::Dynamic inlineHashReferences_dyn();
-
-		::String html();
-		::Dynamic html_dyn();
-
-		::String chatId();
-		::Dynamic chatId_dyn();
-
-		::String account();
-		::Dynamic account_dyn();
-
-		bool isIncoming();
-		::Dynamic isIncoming_dyn();
-
-		::String threadIcon();
-		::Dynamic threadIcon_dyn();
-
-		::String callStatus();
-		::Dynamic callStatus_dyn();
-
-		::String callSid();
-		::Dynamic callSid_dyn();
-
-		::String callDuration();
-		::Dynamic callDuration_dyn();
-
-		 ::snikket::Stanza asStanza();
-		::Dynamic asStanza_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_ChatMessage */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/ChatMessageBuilder.h b/Sources/c_snikket/iinclude/include/snikket/ChatMessageBuilder.h
deleted file mode 100644
index 041e48a..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/ChatMessageBuilder.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_ChatMessageBuilder
-#define INCLUDED_snikket_ChatMessageBuilder
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(htmlparser,HtmlNode)
-HX_DECLARE_CLASS1(snikket,ChatAttachment)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Node)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES ChatMessageBuilder_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ChatMessageBuilder_obj OBJ_;
-		ChatMessageBuilder_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1d9d1345 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.ChatMessageBuilder")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.ChatMessageBuilder"); }
-		static ::hx::ObjectPtr< ChatMessageBuilder_obj > __new();
-		static ::hx::ObjectPtr< ChatMessageBuilder_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ChatMessageBuilder_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ChatMessageBuilder",2c,85,c0,07); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::ChatMessage makeModerated( ::snikket::ChatMessage m,::String timestamp,::String moderatorId,::String reason);
-		static ::Dynamic makeModerated_dyn();
-
-		::String localId;
-		::String localId__fromC();
-		::Dynamic localId__fromC_dyn();
-
-		void set_localId__fromC(::String value);
-		::Dynamic set_localId__fromC_dyn();
-
-		::String serverId;
-		::String serverId__fromC();
-		::Dynamic serverId__fromC_dyn();
-
-		void set_serverId__fromC(::String value);
-		::Dynamic set_serverId__fromC_dyn();
-
-		::String serverIdBy;
-		::String serverIdBy__fromC();
-		::Dynamic serverIdBy__fromC_dyn();
-
-		void set_serverIdBy__fromC(::String value);
-		::Dynamic set_serverIdBy__fromC_dyn();
-
-		int type;
-		int type__fromC();
-		::Dynamic type__fromC_dyn();
-
-		void set_type__fromC(int value);
-		::Dynamic set_type__fromC_dyn();
-
-		bool syncPoint;
-		::String replyId;
-		::String timestamp;
-		::String timestamp__fromC();
-		::Dynamic timestamp__fromC_dyn();
-
-		void set_timestamp__fromC(::String value);
-		::Dynamic set_timestamp__fromC_dyn();
-
-		 ::snikket::JID to;
-		 ::snikket::JID from;
-		 ::snikket::JID sender;
-		::Array< ::Dynamic> recipients;
-		::Array< ::Dynamic> replyTo;
-		::String senderId;
-		::String senderId__fromC();
-		::Dynamic senderId__fromC_dyn();
-
-		void set_senderId__fromC(::String value);
-		::Dynamic set_senderId__fromC_dyn();
-
-		 ::snikket::ChatMessage replyToMessage;
-		 ::snikket::ChatMessage replyToMessage__fromC();
-		::Dynamic replyToMessage__fromC_dyn();
-
-		void set_replyToMessage__fromC( ::snikket::ChatMessage value);
-		::Dynamic set_replyToMessage__fromC_dyn();
-
-		::String threadId;
-		::String threadId__fromC();
-		::Dynamic threadId__fromC_dyn();
-
-		void set_threadId__fromC(::String value);
-		::Dynamic set_threadId__fromC_dyn();
-
-		::Array< ::Dynamic> attachments;
-		size_t attachments__fromC(void*** outPtr);
-
-		 ::haxe::ds::StringMap reactions;
-		::String text;
-		::String text__fromC();
-		::Dynamic text__fromC_dyn();
-
-		void set_text__fromC(::String value);
-		::Dynamic set_text__fromC_dyn();
-
-		::String lang;
-		::String lang__fromC();
-		::Dynamic lang__fromC_dyn();
-
-		void set_lang__fromC(::String value);
-		::Dynamic set_lang__fromC_dyn();
-
-		int direction;
-		int direction__fromC();
-		::Dynamic direction__fromC_dyn();
-
-		void set_direction__fromC(int value);
-		::Dynamic set_direction__fromC_dyn();
-
-		int status;
-		int status__fromC();
-		::Dynamic status__fromC_dyn();
-
-		void set_status__fromC(int value);
-		::Dynamic set_status__fromC_dyn();
-
-		::Array< ::Dynamic> versions;
-		size_t versions__fromC(void*** outPtr);
-
-		::Array< ::Dynamic> payloads;
-		 ::snikket::Stanza stanza;
-		void attachSims( ::snikket::Stanza sims);
-		::Dynamic attachSims_dyn();
-
-		void addAttachment( ::snikket::ChatAttachment attachment);
-		::Dynamic addAttachment_dyn();
-
-		void setHtml(::String html);
-		::Dynamic setHtml_dyn();
-
-		 ::snikket::Node htmlToNode( ::htmlparser::HtmlNode node);
-		::Dynamic htmlToNode_dyn();
-
-		::String chatId();
-		::Dynamic chatId_dyn();
-
-		::String get_senderId();
-		::Dynamic get_senderId_dyn();
-
-		bool isIncoming();
-		::Dynamic isIncoming_dyn();
-
-		 ::snikket::ChatMessage build();
-		::Dynamic build_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_ChatMessageBuilder */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Client.h b/Sources/c_snikket/iinclude/include/snikket/Client.h
deleted file mode 100644
index 8908f68..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Client.h
+++ /dev/null
@@ -1,279 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Client
-#define INCLUDED_snikket_Client
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_EventEmitter
-#include <snikket/EventEmitter.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,AttachmentSource)
-HX_DECLARE_CLASS1(snikket,AvailableChat)
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatAttachment)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,DirectChat)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,EventResult)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,Hash)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,ModerationAction)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,InitiatedSession)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(snikket,jingle,Session)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Client_obj : public  ::snikket::EventEmitter_obj
-{
-	public:
-		typedef  ::snikket::EventEmitter_obj super;
-		typedef Client_obj OBJ_;
-		Client_obj();
-
-	public:
-		enum { _hx_ClassId = 0x668a7be8 };
-
-		void __construct(::String address,::Dynamic persistence);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Client")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Client"); }
-		static ::hx::ObjectPtr< Client_obj > __new(::String address,::Dynamic persistence);
-		static ::hx::ObjectPtr< Client_obj > __alloc(::hx::Ctx *_hx_ctx,::String address,::Dynamic persistence);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Client_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Client",6b,3e,e4,3e); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		bool sendAvailable;
-		void set_sendAvailable__fromC(bool value);
-		::Dynamic set_sendAvailable__fromC_dyn();
-
-		 ::snikket::GenericStream stream;
-		::Array< ::Dynamic> chatMessageHandlers;
-		::Array< ::Dynamic> syncMessageHandlers;
-		::Array< ::Dynamic> chatStateHandlers;
-		 ::snikket::JID jid;
-		::Array< ::Dynamic> chats;
-		::Dynamic persistence;
-		 ::snikket::Caps caps;
-		::String _displayName;
-		::String fastMechanism;
-		::String token;
-		 ::haxe::ds::StringMap pendingCaps;
-		bool inSync;
-		void start();
-		::Dynamic start_dyn();
-
-		void logout(bool completely);
-		::Dynamic logout_dyn();
-
-		void usePassword(::String password);
-		::Dynamic usePassword_dyn();
-
-		::String accountId();
-		::Dynamic accountId_dyn();
-
-		::String displayName();
-		::Dynamic displayName_dyn();
-
-		void setDisplayName(::String displayName);
-		::Dynamic setDisplayName_dyn();
-
-		bool updateDisplayName(::String fn);
-		::Dynamic updateDisplayName_dyn();
-
-		 ::snikket::EventResult onConnected( ::Dynamic data);
-		::Dynamic onConnected_dyn();
-
-		void prepareAttachment( ::snikket::AttachmentSource source, ::Dynamic callback);
-		::Dynamic prepareAttachment_dyn();
-
-		void prepareAttachment__fromC( ::snikket::AttachmentSource source,::cpp::Function< void  (void*,void*) > callback,void* callback__context);
-
-		void prepareAttachmentFor( ::snikket::AttachmentSource source,::Array< ::Dynamic> services,::Array< ::Dynamic> hashes, ::Dynamic callback);
-		::Dynamic prepareAttachmentFor_dyn();
-
-		::Array< ::Dynamic> getChats();
-		::Dynamic getChats_dyn();
-
-		size_t getChats__fromC(void*** outPtr);
-
-		void findAvailableChats(::String q, ::Dynamic callback);
-		::Dynamic findAvailableChats_dyn();
-
-		void findAvailableChats__fromC(::String q,::cpp::Function< void  (const char*,void**,size_t,void*) > callback,void* callback__context);
-
-		 ::snikket::Chat startChat( ::snikket::AvailableChat availableChat);
-		::Dynamic startChat_dyn();
-
-		 ::snikket::Chat getChat(::String chatId);
-		::Dynamic getChat_dyn();
-
-		::Dynamic moderateMessage( ::snikket::ModerationAction action);
-		::Dynamic moderateMessage_dyn();
-
-		 ::snikket::DirectChat getDirectChat(::String chatId,::hx::Null< bool >  triggerIfNew);
-		::Dynamic getDirectChat_dyn();
-
-		void addPasswordNeededListener( ::Dynamic handler);
-		::Dynamic addPasswordNeededListener_dyn();
-
-		void addPasswordNeededListener__fromC(::cpp::Function< void  (void*,void*) > handler,void* handler__context);
-
-		void addStatusOnlineListener( ::Dynamic handler);
-		::Dynamic addStatusOnlineListener_dyn();
-
-		void addStatusOnlineListener__fromC(::cpp::Function< void  (void*) > handler,void* handler__context);
-
-		void addStatusOfflineListener( ::Dynamic handler);
-		::Dynamic addStatusOfflineListener_dyn();
-
-		void addStatusOfflineListener__fromC(::cpp::Function< void  (void*) > handler,void* handler__context);
-
-		void addConnectionFailedListener( ::Dynamic handler);
-		::Dynamic addConnectionFailedListener_dyn();
-
-		void addConnectionFailedListener__fromC(::cpp::Function< void  (void*) > handler,void* handler__context);
-
-		void addChatMessageListener( ::Dynamic handler);
-		::Dynamic addChatMessageListener_dyn();
-
-		void addChatMessageListener__fromC(::cpp::Function< void  (void*,int,void*) > handler,void* handler__context);
-
-		void addSyncMessageListener( ::Dynamic handler);
-		::Dynamic addSyncMessageListener_dyn();
-
-		void addSyncMessageListener__fromC(::cpp::Function< void  (void*,void*) > handler,void* handler__context);
-
-		void addChatsUpdatedListener( ::Dynamic handler);
-		::Dynamic addChatsUpdatedListener_dyn();
-
-		void addChatsUpdatedListener__fromC(::cpp::Function< void  (void**,size_t,void*) > handler,void* handler__context);
-
-		void addCallRingListener( ::Dynamic handler);
-		::Dynamic addCallRingListener_dyn();
-
-		void addCallRingListener__fromC(::cpp::Function< void  (void*,const char*,void*) > handler,void* handler__context);
-
-		void addCallRetractListener( ::Dynamic handler);
-		::Dynamic addCallRetractListener_dyn();
-
-		void addCallRetractListener__fromC(::cpp::Function< void  (const char*,void*) > handler,void* handler__context);
-
-		void addCallRingingListener( ::Dynamic handler);
-		::Dynamic addCallRingingListener_dyn();
-
-		void addCallRingingListener__fromC(::cpp::Function< void  (const char*,void*) > handler,void* handler__context);
-
-		void addCallMediaListener( ::Dynamic handler);
-		::Dynamic addCallMediaListener_dyn();
-
-		void addCallMediaListener__fromC(::cpp::Function< void  (void*,bool,bool,void*) > handler,void* handler__context);
-
-		void addCallTrackListener( ::Dynamic handler);
-		::Dynamic addCallTrackListener_dyn();
-
-		void addCallTrackListener__fromC(::cpp::Function< void  (const char*,void*,void**,size_t,void*) > handler,void* handler__context);
-
-		void setInForeground();
-		::Dynamic setInForeground_dyn();
-
-		void setNotInForeground();
-		::Dynamic setNotInForeground_dyn();
-
-		::Dynamic fetchMediaByHash(::Array< ::Dynamic> hashes,::Array< ::Dynamic> counterparts);
-		::Dynamic fetchMediaByHash_dyn();
-
-		::Dynamic fetchMediaByHashOneCounterpart(::Array< ::Dynamic> hashes, ::snikket::JID counterpart);
-		::Dynamic fetchMediaByHashOneCounterpart_dyn();
-
-		void chatActivity( ::snikket::Chat chat,::hx::Null< bool >  trigger);
-		::Dynamic chatActivity_dyn();
-
-		void sortChats();
-		::Dynamic sortChats_dyn();
-
-		void storeMessages(::Array< ::Dynamic> messages, ::Dynamic callback);
-		::Dynamic storeMessages_dyn();
-
-		void sendQuery( ::snikket::queries::GenericQuery query);
-		::Dynamic sendQuery_dyn();
-
-		void sendStanza( ::snikket::Stanza stanza);
-		::Dynamic sendStanza_dyn();
-
-		void sendPresence(::String to, ::Dynamic augment);
-		::Dynamic sendPresence_dyn();
-
-		void getIceServers( ::Dynamic callback);
-		::Dynamic getIceServers_dyn();
-
-		void discoverServices( ::snikket::JID target,::String node, ::Dynamic callback);
-		::Dynamic discoverServices_dyn();
-
-		void notifyMessageHandlers( ::snikket::ChatMessage message,int event);
-		::Dynamic notifyMessageHandlers_dyn();
-
-		void notifySyncMessageHandlers( ::snikket::ChatMessage message);
-		::Dynamic notifySyncMessageHandlers_dyn();
-
-		void rosterGet();
-		::Dynamic rosterGet_dyn();
-
-		void startChatWith(::String jid, ::Dynamic handleCaps, ::Dynamic handleChat);
-		::Dynamic startChatWith_dyn();
-
-		void serverBlocked(::String blocked);
-		::Dynamic serverBlocked_dyn();
-
-		void bookmarksGet( ::Dynamic callback);
-		::Dynamic bookmarksGet_dyn();
-
-		void sync( ::Dynamic callback);
-		::Dynamic sync_dyn();
-
-		void onMAMJMI(::String sid, ::snikket::Stanza stanza);
-		::Dynamic onMAMJMI_dyn();
-
-		void doSync( ::Dynamic callback,::String lastId);
-		::Dynamic doSync_dyn();
-
-		void pingAllChannels(bool refresh);
-		::Dynamic pingAllChannels_dyn();
-
-		void joinAllChannels();
-		::Dynamic joinAllChannels_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Client */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Color.h b/Sources/c_snikket/iinclude/include/snikket/Color.h
deleted file mode 100644
index 074383f..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Color.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Color
-#define INCLUDED_snikket_Color
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Color)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Color_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Color_obj OBJ_;
-		Color_obj();
-
-	public:
-		enum { _hx_ClassId = 0x204ca266 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.Color")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.Color"); }
-
-		inline static ::hx::ObjectPtr< Color_obj > __new() {
-			::hx::ObjectPtr< Color_obj > __this = new Color_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Color_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Color_obj *__this = (Color_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Color_obj), false, "snikket.Color"));
-			*(void **)__this = Color_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Color_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Color",43,e1,89,dd); }
-
-		static ::String forString(::String s);
-		static ::Dynamic forString_dyn();
-
-		static ::String defaultPhoto(::String input,::String letter);
-		static ::Dynamic defaultPhoto_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Color */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Config.h b/Sources/c_snikket/iinclude/include/snikket/Config.h
deleted file mode 100644
index a987dd2..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Config
-#define INCLUDED_snikket_Config
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Config)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Config_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Config_obj OBJ_;
-		Config_obj();
-
-	public:
-		enum { _hx_ClassId = 0x240d085f };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.Config")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.Config"); }
-
-		inline static ::hx::ObjectPtr< Config_obj > __new() {
-			::hx::ObjectPtr< Config_obj > __this = new Config_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Config_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Config_obj *__this = (Config_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Config_obj), false, "snikket.Config"));
-			*(void **)__this = Config_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Config_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Config",e2,ca,66,fc); }
-
-		static void __boot();
-		static bool relativeHashUri;
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Config */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/CustomEmojiReaction.h b/Sources/c_snikket/iinclude/include/snikket/CustomEmojiReaction.h
deleted file mode 100644
index 304c858..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/CustomEmojiReaction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_CustomEmojiReaction
-#define INCLUDED_snikket_CustomEmojiReaction
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_Reaction
-#include <snikket/Reaction.h>
-#endif
-HX_DECLARE_CLASS1(snikket,CustomEmojiReaction)
-HX_DECLARE_CLASS1(snikket,Reaction)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES CustomEmojiReaction_obj : public  ::snikket::Reaction_obj
-{
-	public:
-		typedef  ::snikket::Reaction_obj super;
-		typedef CustomEmojiReaction_obj OBJ_;
-		CustomEmojiReaction_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1e93c5e9 };
-
-		void __construct(::String senderId,::String timestamp,::String text,::String uri,::String envelopeId);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.CustomEmojiReaction")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.CustomEmojiReaction"); }
-		static ::hx::ObjectPtr< CustomEmojiReaction_obj > __new(::String senderId,::String timestamp,::String text,::String uri,::String envelopeId);
-		static ::hx::ObjectPtr< CustomEmojiReaction_obj > __alloc(::hx::Ctx *_hx_ctx,::String senderId,::String timestamp,::String text,::String uri,::String envelopeId);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~CustomEmojiReaction_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("CustomEmojiReaction",be,8e,6d,ec); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String uri;
-		::String uri__fromC();
-		::Dynamic uri__fromC_dyn();
-
-		 ::Dynamic render( ::Dynamic forText, ::Dynamic forImage);
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_CustomEmojiReaction */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Date.h b/Sources/c_snikket/iinclude/include/snikket/Date.h
deleted file mode 100644
index 19af500..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Date.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Date
-#define INCLUDED_snikket_Date
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS0(Date)
-HX_DECLARE_CLASS1(snikket,Date)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Date_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Date_obj OBJ_;
-		Date_obj();
-
-	public:
-		enum { _hx_ClassId = 0x030f768b };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.Date")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.Date"); }
-
-		inline static ::hx::ObjectPtr< Date_obj > __new() {
-			::hx::ObjectPtr< Date_obj > __this = new Date_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Date_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Date_obj *__this = (Date_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Date_obj), false, "snikket.Date"));
-			*(void **)__this = Date_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Date_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Date",4e,82,3c,2d); }
-
-		static ::String format( ::Date d);
-		static ::Dynamic format_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Date */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/DirectChat.h b/Sources/c_snikket/iinclude/include/snikket/DirectChat.h
deleted file mode 100644
index e8a37c4..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/DirectChat.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_DirectChat
-#define INCLUDED_snikket_DirectChat
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_Chat
-#include <snikket/Chat.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,DirectChat)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,Participant)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,Reaction)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES DirectChat_obj : public  ::snikket::Chat_obj
-{
-	public:
-		typedef  ::snikket::Chat_obj super;
-		typedef DirectChat_obj OBJ_;
-		DirectChat_obj();
-
-	public:
-		enum { _hx_ClassId = 0x62c262be };
-
-		void __construct( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.DirectChat")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.DirectChat"); }
-		static ::hx::ObjectPtr< DirectChat_obj > __new( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy);
-		static ::hx::ObjectPtr< DirectChat_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DirectChat_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DirectChat",c1,22,a3,05); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::Array< ::String > getParticipants();
-
-		::Array< ::String > counterparts();
-		::Dynamic counterparts_dyn();
-
-		 ::snikket::Participant getParticipantDetails(::String participantId);
-
-		void getMessagesBefore(::String beforeId,::String beforeTime, ::Dynamic handler);
-
-		void getMessagesAfter(::String afterId,::String afterTime, ::Dynamic handler);
-
-		void getMessagesAround(::String aroundId,::String aroundTime, ::Dynamic handler);
-
-		 ::snikket::ChatMessageBuilder prepareIncomingMessage( ::snikket::ChatMessageBuilder message, ::snikket::Stanza stanza);
-
-		 ::snikket::ChatMessageBuilder prepareOutgoingMessage( ::snikket::ChatMessageBuilder message);
-		::Dynamic prepareOutgoingMessage_dyn();
-
-		void correctMessage(::String localId, ::snikket::ChatMessageBuilder message);
-
-		void sendMessage( ::snikket::ChatMessageBuilder message);
-
-		void removeReaction( ::snikket::ChatMessage m, ::snikket::Reaction reaction);
-
-		::String lastMessageId();
-
-		void markReadUpTo( ::snikket::ChatMessage message);
-
-		void bookmark();
-
-		void sendChatState(::String state,::String threadId);
-
-		void close();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_DirectChat */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Emoji.h b/Sources/c_snikket/iinclude/include/snikket/Emoji.h
deleted file mode 100644
index 685d92e..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Emoji.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Emoji
-#define INCLUDED_snikket_Emoji
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_Symbol
-#include <snikket/Symbol.h>
-#endif
-HX_DECLARE_STACK_FRAME(_hx_pos_dd1b4f8973e1f9df_136_new)
-HX_DECLARE_CLASS1(snikket,Emoji)
-HX_DECLARE_CLASS1(snikket,Symbol)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Emoji_obj : public  ::snikket::Symbol_obj
-{
-	public:
-		typedef  ::snikket::Symbol_obj super;
-		typedef Emoji_obj OBJ_;
-		Emoji_obj();
-
-	public:
-		enum { _hx_ClassId = 0x45c9a089 };
-
-		void __construct(::Array< int > codepoints);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Emoji")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Emoji"); }
-
-		inline static ::hx::ObjectPtr< Emoji_obj > __new(::Array< int > codepoints) {
-			::hx::ObjectPtr< Emoji_obj > __this = new Emoji_obj();
-			__this->__construct(codepoints);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Emoji_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< int > codepoints) {
-			Emoji_obj *__this = (Emoji_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Emoji_obj), true, "snikket.Emoji"));
-			*(void **)__this = Emoji_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_dd1b4f8973e1f9df_136_new)
-HXDLIN( 136)		__this->super::__construct(codepoints);
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Emoji_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Emoji",66,df,06,03); }
-
-		bool isEmoji();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Emoji */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/EmojiUtil.h b/Sources/c_snikket/iinclude/include/snikket/EmojiUtil.h
deleted file mode 100644
index f45f679..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/EmojiUtil.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_EmojiUtil
-#define INCLUDED_snikket_EmojiUtil
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,EmojiUtil)
-HX_DECLARE_CLASS1(snikket,Symbol)
-HX_DECLARE_CLASS1(snikket,UnicodeBlocks)
-HX_DECLARE_CLASS1(snikket,UnicodeList)
-HX_DECLARE_CLASS1(snikket,UnicodeRange)
-HX_DECLARE_CLASS1(snikket,UnicodeSet)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES EmojiUtil_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EmojiUtil_obj OBJ_;
-		EmojiUtil_obj();
-
-	public:
-		enum { _hx_ClassId = 0x636eb1f3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.EmojiUtil")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.EmojiUtil"); }
-
-		inline static ::hx::ObjectPtr< EmojiUtil_obj > __new() {
-			::hx::ObjectPtr< EmojiUtil_obj > __this = new EmojiUtil_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< EmojiUtil_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			EmojiUtil_obj *__this = (EmojiUtil_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(EmojiUtil_obj), false, "snikket.EmojiUtil"));
-			*(void **)__this = EmojiUtil_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EmojiUtil_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("EmojiUtil",88,0e,c9,4c); }
-
-		static void __boot();
-		static  ::snikket::UnicodeRange MISC_SYMBOLS_AND_PICTOGRAPHS;
-		static  ::snikket::UnicodeRange SUPPLEMENTAL_SYMBOLS;
-		static  ::snikket::UnicodeRange EMOTICONS;
-		static  ::snikket::UnicodeRange MISC_SYMBOLS;
-		static  ::snikket::UnicodeRange DINGBATS;
-		static  ::snikket::UnicodeRange ENCLOSED_ALPHANUMERIC_SUPPLEMENT;
-		static  ::snikket::UnicodeRange ENCLOSED_IDEOGRAPHIC_SUPPLEMENT;
-		static  ::snikket::UnicodeRange REGIONAL_INDICATORS;
-		static  ::snikket::UnicodeRange GEOMETRIC_SHAPES;
-		static  ::snikket::UnicodeRange LATIN_SUPPLEMENT;
-		static  ::snikket::UnicodeRange MISC_TECHNICAL;
-		static  ::snikket::UnicodeRange TAGS;
-		static  ::snikket::UnicodeList CYK_SYMBOLS_AND_PUNCTUATION;
-		static  ::snikket::UnicodeList LETTERLIKE_SYMBOLS;
-		static  ::snikket::UnicodeBlocks KEYCAP_COMBINEABLE;
-		static  ::snikket::UnicodeBlocks SYMBOLIZE;
-		static  ::snikket::UnicodeBlocks EMOJIS;
-		static int ZWJ;
-		static int VARIATION_16;
-		static int COMBINING_ENCLOSING_KEYCAP;
-		static int BLACK_FLAG;
-		static  ::snikket::UnicodeRange FITZPATRICK;
-		static ::Array< ::Dynamic> parse(::String str);
-		static ::Dynamic parse_dyn();
-
-		static bool isEmoji(::String input);
-		static ::Dynamic isEmoji_dyn();
-
-		static bool isOnlyEmoji(::String input);
-		static ::Dynamic isOnlyEmoji_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_EmojiUtil */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/EventEmitter.h b/Sources/c_snikket/iinclude/include/snikket/EventEmitter.h
deleted file mode 100644
index 7b9ee4d..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/EventEmitter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_EventEmitter
-#define INCLUDED_snikket_EventEmitter
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,EventHandler)
-HX_DECLARE_CLASS1(snikket,EventResult)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES EventEmitter_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EventEmitter_obj OBJ_;
-		EventEmitter_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6aca71d1 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.EventEmitter")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.EventEmitter"); }
-		static ::hx::ObjectPtr< EventEmitter_obj > __new();
-		static ::hx::ObjectPtr< EventEmitter_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EventEmitter_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("EventEmitter",94,78,5d,17); }
-
-		 ::haxe::ds::StringMap eventHandlers;
-		 ::snikket::EventHandler on(::String eventName, ::Dynamic callback);
-		::Dynamic on_dyn();
-
-		 ::snikket::EventHandler once(::String eventName, ::Dynamic callback);
-		::Dynamic once_dyn();
-
-		 ::snikket::EventResult trigger(::String eventName, ::Dynamic eventData);
-		::Dynamic trigger_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_EventEmitter */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/EventHandler.h b/Sources/c_snikket/iinclude/include/snikket/EventHandler.h
deleted file mode 100644
index c25353d..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/EventHandler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_EventHandler
-#define INCLUDED_snikket_EventHandler
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,EventHandler)
-HX_DECLARE_CLASS1(snikket,EventResult)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES EventHandler_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EventHandler_obj OBJ_;
-		EventHandler_obj();
-
-	public:
-		enum { _hx_ClassId = 0x39717849 };
-
-		void __construct(::Array< ::Dynamic> handlers, ::Dynamic callback, ::Dynamic onlyOnce);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.EventHandler")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.EventHandler"); }
-		static ::hx::ObjectPtr< EventHandler_obj > __new(::Array< ::Dynamic> handlers, ::Dynamic callback, ::Dynamic onlyOnce);
-		static ::hx::ObjectPtr< EventHandler_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< ::Dynamic> handlers, ::Dynamic callback, ::Dynamic onlyOnce);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EventHandler_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("EventHandler",f0,f2,3c,9e); }
-
-		::Array< ::Dynamic> handlers;
-		 ::Dynamic callback;
-		Dynamic callback_dyn() { return callback;}
-		bool onlyOnce;
-		 ::snikket::EventResult call( ::Dynamic data);
-		::Dynamic call_dyn();
-
-		 ::snikket::EventHandler once();
-		::Dynamic once_dyn();
-
-		void unsubscribe();
-		::Dynamic unsubscribe_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_EventHandler */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/EventResult.h b/Sources/c_snikket/iinclude/include/snikket/EventResult.h
deleted file mode 100644
index b3b5504..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/EventResult.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_EventResult
-#define INCLUDED_snikket_EventResult
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,EventResult)
-namespace snikket{
-
-
-class EventResult_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef EventResult_obj OBJ_;
-
-	public:
-		EventResult_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("snikket.EventResult",06,97,23,e2); }
-		::String __ToString() const { return HX_("EventResult.",d7,9b,be,c3) + _hx_tag; }
-
-		static ::snikket::EventResult EventHandled;
-		static inline ::snikket::EventResult EventHandled_dyn() { return EventHandled; }
-		static ::snikket::EventResult EventStop;
-		static inline ::snikket::EventResult EventStop_dyn() { return EventStop; }
-		static ::snikket::EventResult EventUnhandled;
-		static inline ::snikket::EventResult EventUnhandled_dyn() { return EventUnhandled; }
-		static ::snikket::EventResult EventValue( ::Dynamic result);
-		static ::Dynamic EventValue_dyn();
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_EventResult */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/GenericStream.h b/Sources/c_snikket/iinclude/include/snikket/GenericStream.h
deleted file mode 100644
index 50fc0bd..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/GenericStream.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_GenericStream
-#define INCLUDED_snikket_GenericStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_EventEmitter
-#include <snikket/EventEmitter.h>
-#endif
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,IqRequestType)
-HX_DECLARE_CLASS1(snikket,IqResult)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES GenericStream_obj : public  ::snikket::EventEmitter_obj
-{
-	public:
-		typedef  ::snikket::EventEmitter_obj super;
-		typedef GenericStream_obj OBJ_;
-		GenericStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x785c9e5e };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.GenericStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.GenericStream"); }
-
-		//~GenericStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("GenericStream",d7,75,9c,45); }
-
-		::String clientId;
-		bool csi;
-		virtual void connect(::String jid,::Array< unsigned char > sm) {}
-		::Dynamic connect_dyn();
-		virtual void disconnect() {}
-		::Dynamic disconnect_dyn();
-		virtual void sendStanza( ::snikket::Stanza stanza) {}
-		::Dynamic sendStanza_dyn();
-		virtual ::String newId() { return 0; }
-		::Dynamic newId_dyn();
-		virtual void onIq( ::snikket::IqRequestType type,::String tag,::String xmlns, ::Dynamic handler) {}
-		::Dynamic onIq_dyn();
-		void sendIq( ::snikket::Stanza stanza, ::Dynamic callback);
-		::Dynamic sendIq_dyn();
-
-		void onStanza( ::snikket::Stanza stanza);
-		::Dynamic onStanza_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_GenericStream */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Hash.h b/Sources/c_snikket/iinclude/include/snikket/Hash.h
deleted file mode 100644
index 8be664d..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Hash.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Hash
-#define INCLUDED_snikket_Hash
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS1(snikket,Hash)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Hash_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Hash_obj OBJ_;
-		Hash_obj();
-
-	public:
-		enum { _hx_ClassId = 0x05b4502b };
-
-		void __construct(::String algorithm,::Array< unsigned char > hash);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Hash")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Hash"); }
-		static ::hx::ObjectPtr< Hash_obj > __new(::String algorithm,::Array< unsigned char > hash);
-		static ::hx::ObjectPtr< Hash_obj > __alloc(::hx::Ctx *_hx_ctx,::String algorithm,::Array< unsigned char > hash);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Hash_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Hash",ee,5b,e1,2f); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::Hash fromHex(::String algorithm,::String hash);
-		static ::Dynamic fromHex_dyn();
-
-		static  ::snikket::Hash fromUri(::String uri);
-		static ::Dynamic fromUri_dyn();
-
-		static  ::snikket::Hash sha1( ::haxe::io::Bytes bytes);
-		static ::Dynamic sha1_dyn();
-
-		static  ::snikket::Hash sha256( ::haxe::io::Bytes bytes);
-		static ::Dynamic sha256_dyn();
-
-		::String algorithm;
-		::String algorithm__fromC();
-		::Dynamic algorithm__fromC_dyn();
-
-		::Array< unsigned char > hash;
-		::String toUri();
-		::Dynamic toUri_dyn();
-
-		::String bobUri();
-		::Dynamic bobUri_dyn();
-
-		::String serializeUri();
-		::Dynamic serializeUri_dyn();
-
-		::String toHex();
-		::Dynamic toHex_dyn();
-
-		::String toBase64();
-		::Dynamic toBase64_dyn();
-
-		::String toBase64Url();
-		::Dynamic toBase64Url_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Hash */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/ID.h b/Sources/c_snikket/iinclude/include/snikket/ID.h
deleted file mode 100644
index 6d5d8c6..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/ID.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_ID
-#define INCLUDED_snikket_ID
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,ID)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES ID_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ID_obj OBJ_;
-		ID_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5880bad8 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.ID")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.ID"); }
-
-		inline static ::hx::ObjectPtr< ID_obj > __new() {
-			::hx::ObjectPtr< ID_obj > __this = new ID_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< ID_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			ID_obj *__this = (ID_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ID_obj), false, "snikket.ID"));
-			*(void **)__this = ID_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ID_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ID",db,3f,00,00); }
-
-		static ::String tiny();
-		static ::Dynamic tiny_dyn();
-
-		static ::String _hx_short();
-		static ::Dynamic _hx_short_dyn();
-
-		static ::String medium();
-		static ::Dynamic medium_dyn();
-
-		static ::String _hx_long();
-		static ::Dynamic _hx_long_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_ID */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Identicon.h b/Sources/c_snikket/iinclude/include/snikket/Identicon.h
deleted file mode 100644
index f440dab..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Identicon.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Identicon
-#define INCLUDED_snikket_Identicon
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Identicon)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Identicon_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Identicon_obj OBJ_;
-		Identicon_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3ab0d0ec };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.Identicon")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.Identicon"); }
-
-		inline static ::hx::ObjectPtr< Identicon_obj > __new() {
-			::hx::ObjectPtr< Identicon_obj > __this = new Identicon_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Identicon_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Identicon_obj *__this = (Identicon_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Identicon_obj), false, "snikket.Identicon"));
-			*(void **)__this = Identicon_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Identicon_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Identicon",49,42,f3,f1); }
-
-		static ::String svg(::String source);
-		static ::Dynamic svg_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Identicon */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Identity.h b/Sources/c_snikket/iinclude/include/snikket/Identity.h
deleted file mode 100644
index 28c9c85..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Identity.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Identity
-#define INCLUDED_snikket_Identity
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Identity)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Identity_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Identity_obj OBJ_;
-		Identity_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7fcd1307 };
-
-		void __construct(::String category,::String type,::String name);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Identity")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Identity"); }
-		static ::hx::ObjectPtr< Identity_obj > __new(::String category,::String type,::String name);
-		static ::hx::ObjectPtr< Identity_obj > __alloc(::hx::Ctx *_hx_ctx,::String category,::String type,::String name);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Identity_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Identity",5e,01,e1,92); }
-
-		::String category;
-		::String type;
-		::String name;
-		void addToDisco( ::snikket::Stanza stanza);
-		::Dynamic addToDisco_dyn();
-
-		::String ver();
-		::Dynamic ver_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Identity */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/IqRequestType.h b/Sources/c_snikket/iinclude/include/snikket/IqRequestType.h
deleted file mode 100644
index b4f759d..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/IqRequestType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_IqRequestType
-#define INCLUDED_snikket_IqRequestType
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,IqRequestType)
-namespace snikket{
-
-
-class IqRequestType_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef IqRequestType_obj OBJ_;
-
-	public:
-		IqRequestType_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("snikket.IqRequestType",d0,62,72,94); }
-		::String __ToString() const { return HX_("IqRequestType.",8d,9a,13,cc) + _hx_tag; }
-
-		static ::snikket::IqRequestType Get;
-		static inline ::snikket::IqRequestType Get_dyn() { return Get; }
-		static ::snikket::IqRequestType Set;
-		static inline ::snikket::IqRequestType Set_dyn() { return Set; }
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_IqRequestType */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/IqResult.h b/Sources/c_snikket/iinclude/include/snikket/IqResult.h
deleted file mode 100644
index 81b0271..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/IqResult.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_IqResult
-#define INCLUDED_snikket_IqResult
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,IqResult)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-namespace snikket{
-
-
-class IqResult_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef IqResult_obj OBJ_;
-
-	public:
-		IqResult_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("snikket.IqResult",16,e9,a3,c2); }
-		::String __ToString() const { return HX_("IqResult.",89,d1,c3,9e) + _hx_tag; }
-
-		static ::snikket::IqResult IqNoResult;
-		static inline ::snikket::IqResult IqNoResult_dyn() { return IqNoResult; }
-		static ::snikket::IqResult IqResult;
-		static inline ::snikket::IqResult IqResult_dyn() { return IqResult; }
-		static ::snikket::IqResult IqResultElement( ::snikket::Stanza element);
-		static ::Dynamic IqResultElement_dyn();
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_IqResult */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/JID.h b/Sources/c_snikket/iinclude/include/snikket/JID.h
deleted file mode 100644
index c64d0d0..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/JID.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_JID
-#define INCLUDED_snikket_JID
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,JID)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES JID_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef JID_obj OBJ_;
-		JID_obj();
-
-	public:
-		enum { _hx_ClassId = 0x18238908 };
-
-		void __construct(::String node,::String domain,::String resource);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.JID")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.JID"); }
-		static ::hx::ObjectPtr< JID_obj > __new(::String node,::String domain,::String resource);
-		static ::hx::ObjectPtr< JID_obj > __alloc(::hx::Ctx *_hx_ctx,::String node,::String domain,::String resource);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~JID_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("JID",a5,66,38,00); }
-
-		static  ::snikket::JID parse(::String jid);
-		static ::Dynamic parse_dyn();
-
-		::String node;
-		::String domain;
-		::String resource;
-		 ::snikket::JID asBare();
-		::Dynamic asBare_dyn();
-
-		 ::snikket::JID withResource(::String resource);
-		::Dynamic withResource_dyn();
-
-		bool isValid();
-		::Dynamic isValid_dyn();
-
-		bool isDomain();
-		::Dynamic isDomain_dyn();
-
-		bool isBare();
-		::Dynamic isBare_dyn();
-
-		bool equals( ::snikket::JID rhs);
-		::Dynamic equals_dyn();
-
-		::String asString();
-		::Dynamic asString_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_JID */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Message.h b/Sources/c_snikket/iinclude/include/snikket/Message.h
deleted file mode 100644
index 931dcc6..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Message.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Message
-#define INCLUDED_snikket_Message
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Message)
-HX_DECLARE_CLASS1(snikket,MessageStanza)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Message_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Message_obj OBJ_;
-		Message_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7c0c6d2e };
-
-		void __construct(::String chatId,::String senderId,::String threadId, ::snikket::MessageStanza parsed);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Message")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Message"); }
-		static ::hx::ObjectPtr< Message_obj > __new(::String chatId,::String senderId,::String threadId, ::snikket::MessageStanza parsed);
-		static ::hx::ObjectPtr< Message_obj > __alloc(::hx::Ctx *_hx_ctx,::String chatId,::String senderId,::String threadId, ::snikket::MessageStanza parsed);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Message_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Message",a7,5d,62,67); }
-
-		static  ::snikket::Message fromStanza( ::snikket::Stanza stanza, ::snikket::JID localJid, ::Dynamic addContext);
-		static ::Dynamic fromStanza_dyn();
-
-		::String chatId;
-		::String senderId;
-		::String threadId;
-		 ::snikket::MessageStanza parsed;
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Message */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/MessageStanza.h b/Sources/c_snikket/iinclude/include/snikket/MessageStanza.h
deleted file mode 100644
index 486e5a6..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/MessageStanza.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_MessageStanza
-#define INCLUDED_snikket_MessageStanza
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,MessageStanza)
-HX_DECLARE_CLASS1(snikket,ModerationAction)
-HX_DECLARE_CLASS1(snikket,ReactionUpdate)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-namespace snikket{
-
-
-class MessageStanza_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef MessageStanza_obj OBJ_;
-
-	public:
-		MessageStanza_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("snikket.MessageStanza",4b,b3,84,a4); }
-		::String __ToString() const { return HX_("MessageStanza.",b2,b5,07,cc) + _hx_tag; }
-
-		static ::snikket::MessageStanza ChatMessageStanza( ::snikket::ChatMessage message);
-		static ::Dynamic ChatMessageStanza_dyn();
-		static ::snikket::MessageStanza ErrorMessageStanza( ::snikket::Stanza stanza);
-		static ::Dynamic ErrorMessageStanza_dyn();
-		static ::snikket::MessageStanza ModerateMessageStanza( ::snikket::ModerationAction action);
-		static ::Dynamic ModerateMessageStanza_dyn();
-		static ::snikket::MessageStanza ReactionUpdateStanza( ::snikket::ReactionUpdate update);
-		static ::Dynamic ReactionUpdateStanza_dyn();
-		static ::snikket::MessageStanza UnknownMessageStanza( ::snikket::Stanza stanza);
-		static ::Dynamic UnknownMessageStanza_dyn();
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_MessageStanza */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/MessageSync.h b/Sources/c_snikket/iinclude/include/snikket/MessageSync.h
deleted file mode 100644
index 7469276..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/MessageSync.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_MessageSync
-#define INCLUDED_snikket_MessageSync
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,ChatMessageBuilder)
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,MessageSync)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES MessageSync_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MessageSync_obj OBJ_;
-		MessageSync_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0c8e50c1 };
-
-		void __construct( ::snikket::Client client, ::snikket::GenericStream stream, ::Dynamic filter,::String serviceJID);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.MessageSync")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.MessageSync"); }
-		static ::hx::ObjectPtr< MessageSync_obj > __new( ::snikket::Client client, ::snikket::GenericStream stream, ::Dynamic filter,::String serviceJID);
-		static ::hx::ObjectPtr< MessageSync_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::GenericStream stream, ::Dynamic filter,::String serviceJID);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MessageSync_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MessageSync",a2,a3,78,63); }
-
-		 ::snikket::Client client;
-		 ::snikket::GenericStream stream;
-		 ::Dynamic filter;
-		::String serviceJID;
-		 ::Dynamic handler;
-		Dynamic handler_dyn() { return handler;}
-		 ::Dynamic contextHandler;
-		Dynamic contextHandler_dyn() { return contextHandler;}
-		 ::Dynamic errorHandler;
-		Dynamic errorHandler_dyn() { return errorHandler;}
-		 ::Dynamic lastPage;
-		int progress;
-		bool complete;
-		bool newestPageFirst;
-		 ::haxe::ds::StringMap jmi;
-		void fetchNext();
-		::Dynamic fetchNext_dyn();
-
-		bool hasMore();
-		::Dynamic hasMore_dyn();
-
-		void addContext( ::Dynamic handler);
-		::Dynamic addContext_dyn();
-
-		void onMessages( ::Dynamic handler);
-		::Dynamic onMessages_dyn();
-
-		void onError( ::Dynamic handler);
-		::Dynamic onError_dyn();
-
-		void setNewestPageFirst(bool newestPageFirst);
-		::Dynamic setNewestPageFirst_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_MessageSync */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/ModerationAction.h b/Sources/c_snikket/iinclude/include/snikket/ModerationAction.h
deleted file mode 100644
index 16f7e22..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/ModerationAction.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_ModerationAction
-#define INCLUDED_snikket_ModerationAction
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_cab007b58fe42bf8_10_new)
-HX_DECLARE_CLASS1(snikket,ModerationAction)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES ModerationAction_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ModerationAction_obj OBJ_;
-		ModerationAction_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2ac69cd9 };
-
-		void __construct(::String chatId,::String moderateServerId,::String timestamp,::String moderatorId,::String reason);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.ModerationAction")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.ModerationAction"); }
-
-		inline static ::hx::ObjectPtr< ModerationAction_obj > __new(::String chatId,::String moderateServerId,::String timestamp,::String moderatorId,::String reason) {
-			::hx::ObjectPtr< ModerationAction_obj > __this = new ModerationAction_obj();
-			__this->__construct(chatId,moderateServerId,timestamp,moderatorId,reason);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< ModerationAction_obj > __alloc(::hx::Ctx *_hx_ctx,::String chatId,::String moderateServerId,::String timestamp,::String moderatorId,::String reason) {
-			ModerationAction_obj *__this = (ModerationAction_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ModerationAction_obj), true, "snikket.ModerationAction"));
-			*(void **)__this = ModerationAction_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_cab007b58fe42bf8_10_new)
-HXLINE(  11)		( ( ::snikket::ModerationAction)(__this) )->chatId = chatId;
-HXLINE(  12)		( ( ::snikket::ModerationAction)(__this) )->moderateServerId = moderateServerId;
-HXLINE(  13)		( ( ::snikket::ModerationAction)(__this) )->timestamp = timestamp;
-HXLINE(  14)		( ( ::snikket::ModerationAction)(__this) )->moderatorId = moderatorId;
-HXLINE(  15)		( ( ::snikket::ModerationAction)(__this) )->reason = reason;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ModerationAction_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ModerationAction",1c,c1,77,cb); }
-
-		::String chatId;
-		::String moderateServerId;
-		::String timestamp;
-		::String moderatorId;
-		::String reason;
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_ModerationAction */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Node.h b/Sources/c_snikket/iinclude/include/snikket/Node.h
deleted file mode 100644
index 31bf990..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Node.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Node
-#define INCLUDED_snikket_Node
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Node)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS1(snikket,TextNode)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-namespace snikket{
-
-
-class Node_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Node_obj OBJ_;
-
-	public:
-		Node_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("snikket.Node",b3,af,c7,53); }
-		::String __ToString() const { return HX_("Node.",cc,27,ec,32) + _hx_tag; }
-
-		static ::snikket::Node CData( ::snikket::TextNode textNode);
-		static ::Dynamic CData_dyn();
-		static ::snikket::Node Element( ::snikket::Stanza stanza);
-		static ::Dynamic Element_dyn();
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Node */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Notification.h b/Sources/c_snikket/iinclude/include/snikket/Notification.h
deleted file mode 100644
index d41f56b..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Notification.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Notification
-#define INCLUDED_snikket_Notification
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_b0a79cae3ba17812_21_new)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,Notification)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Notification_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Notification_obj OBJ_;
-		Notification_obj();
-
-	public:
-		enum { _hx_ClassId = 0x778a3c48 };
-
-		void __construct(::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Notification")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Notification"); }
-
-		inline static ::hx::ObjectPtr< Notification_obj > __new(::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp) {
-			::hx::ObjectPtr< Notification_obj > __this = new Notification_obj();
-			__this->__construct(title,body,accountId,chatId,messageId,type,callStatus,callSid,imageUri,lang,timestamp);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Notification_obj > __alloc(::hx::Ctx *_hx_ctx,::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp) {
-			Notification_obj *__this = (Notification_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Notification_obj), true, "snikket.Notification"));
-			*(void **)__this = Notification_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_b0a79cae3ba17812_21_new)
-HXLINE(  22)		( ( ::snikket::Notification)(__this) )->title = title;
-HXLINE(  23)		( ( ::snikket::Notification)(__this) )->body = body;
-HXLINE(  24)		( ( ::snikket::Notification)(__this) )->accountId = accountId;
-HXLINE(  25)		( ( ::snikket::Notification)(__this) )->chatId = chatId;
-HXLINE(  26)		( ( ::snikket::Notification)(__this) )->messageId = messageId;
-HXLINE(  27)		( ( ::snikket::Notification)(__this) )->type = type;
-HXLINE(  28)		( ( ::snikket::Notification)(__this) )->callStatus = callStatus;
-HXLINE(  29)		( ( ::snikket::Notification)(__this) )->callSid = callSid;
-HXLINE(  30)		( ( ::snikket::Notification)(__this) )->imageUri = imageUri;
-HXLINE(  31)		( ( ::snikket::Notification)(__this) )->lang = lang;
-HXLINE(  32)		( ( ::snikket::Notification)(__this) )->timestamp = timestamp;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Notification_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Notification",0b,43,1d,24); }
-
-		static  ::snikket::Notification fromChatMessage( ::snikket::ChatMessage m);
-		static ::Dynamic fromChatMessage_dyn();
-
-		static  ::snikket::Notification fromThinStanza( ::snikket::Stanza stanza);
-		static ::Dynamic fromThinStanza_dyn();
-
-		::String title;
-		::String body;
-		::String accountId;
-		::String chatId;
-		::String messageId;
-		int type;
-		::String callStatus;
-		::String callSid;
-		::String imageUri;
-		::String lang;
-		::String timestamp;
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Notification */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Other.h b/Sources/c_snikket/iinclude/include/snikket/Other.h
deleted file mode 100644
index 500f13e..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Other.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Other
-#define INCLUDED_snikket_Other
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_Symbol
-#include <snikket/Symbol.h>
-#endif
-HX_DECLARE_STACK_FRAME(_hx_pos_aac171f877c525f9_146_new)
-HX_DECLARE_CLASS1(snikket,Other)
-HX_DECLARE_CLASS1(snikket,Symbol)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Other_obj : public  ::snikket::Symbol_obj
-{
-	public:
-		typedef  ::snikket::Symbol_obj super;
-		typedef Other_obj OBJ_;
-		Other_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0c6697d3 };
-
-		void __construct(::Array< int > codepoints);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Other")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Other"); }
-
-		inline static ::hx::ObjectPtr< Other_obj > __new(::Array< int > codepoints) {
-			::hx::ObjectPtr< Other_obj > __this = new Other_obj();
-			__this->__construct(codepoints);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Other_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< int > codepoints) {
-			Other_obj *__this = (Other_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Other_obj), true, "snikket.Other"));
-			*(void **)__this = Other_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_aac171f877c525f9_146_new)
-HXDLIN( 146)		__this->super::__construct(codepoints);
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Other_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Other",b0,d6,a3,c9); }
-
-		bool isEmoji();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Other */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Participant.h b/Sources/c_snikket/iinclude/include/snikket/Participant.h
deleted file mode 100644
index 5317907..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Participant.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Participant
-#define INCLUDED_snikket_Participant
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_33195ab9b813f4c6_20_new)
-HX_DECLARE_CLASS1(snikket,Participant)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Participant_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Participant_obj OBJ_;
-		Participant_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7d555cf6 };
-
-		void __construct(::String displayName,::String photoUri,::String placeholderUri,bool isSelf);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Participant")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Participant"); }
-
-		inline static ::hx::ObjectPtr< Participant_obj > __new(::String displayName,::String photoUri,::String placeholderUri,bool isSelf) {
-			::hx::ObjectPtr< Participant_obj > __this = new Participant_obj();
-			__this->__construct(displayName,photoUri,placeholderUri,isSelf);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Participant_obj > __alloc(::hx::Ctx *_hx_ctx,::String displayName,::String photoUri,::String placeholderUri,bool isSelf) {
-			Participant_obj *__this = (Participant_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Participant_obj), true, "snikket.Participant"));
-			*(void **)__this = Participant_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_33195ab9b813f4c6_20_new)
-HXLINE(  21)		( ( ::snikket::Participant)(__this) )->displayName = displayName;
-HXLINE(  22)		( ( ::snikket::Participant)(__this) )->photoUri = photoUri;
-HXLINE(  23)		( ( ::snikket::Participant)(__this) )->placeholderUri = placeholderUri;
-HXLINE(  24)		( ( ::snikket::Participant)(__this) )->isSelf = isSelf;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Participant_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Participant",93,9f,1c,5f); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String displayName;
-		::String displayName__fromC();
-		::Dynamic displayName__fromC_dyn();
-
-		::String photoUri;
-		::String photoUri__fromC();
-		::Dynamic photoUri__fromC_dyn();
-
-		::String placeholderUri;
-		::String placeholderUri__fromC();
-		::Dynamic placeholderUri__fromC_dyn();
-
-		bool isSelf;
-		bool isSelf__fromC();
-		::Dynamic isSelf__fromC_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Participant */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Persistence.h b/Sources/c_snikket/iinclude/include/snikket/Persistence.h
deleted file mode 100644
index b3621d1..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Persistence.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Persistence
-#define INCLUDED_snikket_Persistence
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,ReactionUpdate)
-HX_DECLARE_CLASS1(snikket,SerializedChat)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Persistence_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		static void __boot();
-		void (::hx::Object :: *_hx_lastId)(::String accountId,::String chatId, ::Dynamic callback); 
-		static inline void lastId( ::Dynamic _hx_,::String accountId,::String chatId, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_lastId)(accountId,chatId,callback);
-		}
-		void (::hx::Object :: *_hx_storeChats)(::String accountId,::Array< ::Dynamic> chats); 
-		static inline void storeChats( ::Dynamic _hx_,::String accountId,::Array< ::Dynamic> chats) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeChats)(accountId,chats);
-		}
-		void (::hx::Object :: *_hx_getChats)(::String accountId, ::Dynamic callback); 
-		static inline void getChats( ::Dynamic _hx_,::String accountId, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getChats)(accountId,callback);
-		}
-		void (::hx::Object :: *_hx_getChatsUnreadDetails)(::String accountId,::Array< ::Dynamic> chats, ::Dynamic callback); 
-		static inline void getChatsUnreadDetails( ::Dynamic _hx_,::String accountId,::Array< ::Dynamic> chats, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getChatsUnreadDetails)(accountId,chats,callback);
-		}
-		void (::hx::Object :: *_hx_storeReaction)(::String accountId, ::snikket::ReactionUpdate update, ::Dynamic callback); 
-		static inline void storeReaction( ::Dynamic _hx_,::String accountId, ::snikket::ReactionUpdate update, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeReaction)(accountId,update,callback);
-		}
-		void (::hx::Object :: *_hx_storeMessages)(::String accountId,::Array< ::Dynamic> message, ::Dynamic callback); 
-		static inline void storeMessages( ::Dynamic _hx_,::String accountId,::Array< ::Dynamic> message, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeMessages)(accountId,message,callback);
-		}
-		void (::hx::Object :: *_hx_updateMessage)(::String accountId, ::snikket::ChatMessage message); 
-		static inline void updateMessage( ::Dynamic _hx_,::String accountId, ::snikket::ChatMessage message) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_updateMessage)(accountId,message);
-		}
-		void (::hx::Object :: *_hx_updateMessageStatus)(::String accountId,::String localId,int status, ::Dynamic callback); 
-		static inline void updateMessageStatus( ::Dynamic _hx_,::String accountId,::String localId,int status, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_updateMessageStatus)(accountId,localId,status,callback);
-		}
-		void (::hx::Object :: *_hx_getMessage)(::String accountId,::String chatId,::String serverId,::String localId, ::Dynamic callback); 
-		static inline void getMessage( ::Dynamic _hx_,::String accountId,::String chatId,::String serverId,::String localId, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getMessage)(accountId,chatId,serverId,localId,callback);
-		}
-		void (::hx::Object :: *_hx_getMessagesBefore)(::String accountId,::String chatId,::String beforeId,::String beforeTime, ::Dynamic callback); 
-		static inline void getMessagesBefore( ::Dynamic _hx_,::String accountId,::String chatId,::String beforeId,::String beforeTime, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getMessagesBefore)(accountId,chatId,beforeId,beforeTime,callback);
-		}
-		void (::hx::Object :: *_hx_getMessagesAfter)(::String accountId,::String chatId,::String afterId,::String afterTime, ::Dynamic callback); 
-		static inline void getMessagesAfter( ::Dynamic _hx_,::String accountId,::String chatId,::String afterId,::String afterTime, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getMessagesAfter)(accountId,chatId,afterId,afterTime,callback);
-		}
-		void (::hx::Object :: *_hx_getMessagesAround)(::String accountId,::String chatId,::String aroundId,::String aroundTime, ::Dynamic callback); 
-		static inline void getMessagesAround( ::Dynamic _hx_,::String accountId,::String chatId,::String aroundId,::String aroundTime, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getMessagesAround)(accountId,chatId,aroundId,aroundTime,callback);
-		}
-		void (::hx::Object :: *_hx_hasMedia)(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback); 
-		static inline void hasMedia( ::Dynamic _hx_,::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_hasMedia)(hashAlgorithm,hash,callback);
-		}
-		void (::hx::Object :: *_hx_storeMedia)(::String mime,::Array< unsigned char > bytes, ::Dynamic callback); 
-		static inline void storeMedia( ::Dynamic _hx_,::String mime,::Array< unsigned char > bytes, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeMedia)(mime,bytes,callback);
-		}
-		void (::hx::Object :: *_hx_removeMedia)(::String hashAlgorithm,::Array< unsigned char > hash); 
-		static inline void removeMedia( ::Dynamic _hx_,::String hashAlgorithm,::Array< unsigned char > hash) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_removeMedia)(hashAlgorithm,hash);
-		}
-		void (::hx::Object :: *_hx_storeCaps)( ::snikket::Caps caps); 
-		static inline void storeCaps( ::Dynamic _hx_, ::snikket::Caps caps) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeCaps)(caps);
-		}
-		void (::hx::Object :: *_hx_getCaps)(::String ver, ::Dynamic callback); 
-		static inline void getCaps( ::Dynamic _hx_,::String ver, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getCaps)(ver,callback);
-		}
-		void (::hx::Object :: *_hx_storeLogin)(::String login,::String clientId,::String displayName,::String token); 
-		static inline void storeLogin( ::Dynamic _hx_,::String login,::String clientId,::String displayName,::String token) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeLogin)(login,clientId,displayName,token);
-		}
-		void (::hx::Object :: *_hx_getLogin)(::String login, ::Dynamic callback); 
-		static inline void getLogin( ::Dynamic _hx_,::String login, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getLogin)(login,callback);
-		}
-		void (::hx::Object :: *_hx_removeAccount)(::String accountId,bool completely); 
-		static inline void removeAccount( ::Dynamic _hx_,::String accountId,bool completely) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_removeAccount)(accountId,completely);
-		}
-		void (::hx::Object :: *_hx_listAccounts)( ::Dynamic callback); 
-		static inline void listAccounts( ::Dynamic _hx_, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_listAccounts)(callback);
-		}
-		void (::hx::Object :: *_hx_storeStreamManagement)(::String accountId,::Array< unsigned char > data); 
-		static inline void storeStreamManagement( ::Dynamic _hx_,::String accountId,::Array< unsigned char > data) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeStreamManagement)(accountId,data);
-		}
-		void (::hx::Object :: *_hx_getStreamManagement)(::String accountId, ::Dynamic callback); 
-		static inline void getStreamManagement( ::Dynamic _hx_,::String accountId, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_getStreamManagement)(accountId,callback);
-		}
-		void (::hx::Object :: *_hx_storeService)(::String accountId,::String serviceId,::String name,::String node, ::snikket::Caps caps); 
-		static inline void storeService( ::Dynamic _hx_,::String accountId,::String serviceId,::String name,::String node, ::snikket::Caps caps) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_storeService)(accountId,serviceId,name,node,caps);
-		}
-		void (::hx::Object :: *_hx_findServicesWithFeature)(::String accountId,::String feature, ::Dynamic callback); 
-		static inline void findServicesWithFeature( ::Dynamic _hx_,::String accountId,::String feature, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::Persistence_obj *>(_hx_.mPtr->_hx_getInterface(0x3e9d59e2)))->_hx_findServicesWithFeature)(accountId,feature,callback);
-		}
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Persistence */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Presence.h b/Sources/c_snikket/iinclude/include/snikket/Presence.h
deleted file mode 100644
index ac48ae8..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Presence.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Presence
-#define INCLUDED_snikket_Presence
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Presence)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Presence_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Presence_obj OBJ_;
-		Presence_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4c576518 };
-
-		void __construct( ::snikket::Caps caps, ::snikket::Stanza mucUser);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Presence")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Presence"); }
-		static ::hx::ObjectPtr< Presence_obj > __new( ::snikket::Caps caps, ::snikket::Stanza mucUser);
-		static ::hx::ObjectPtr< Presence_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Caps caps, ::snikket::Stanza mucUser);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Presence_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Presence",5b,0e,89,40); }
-
-		 ::snikket::Caps caps;
-		 ::snikket::Stanza mucUser;
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Presence */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/PubsubEvent.h b/Sources/c_snikket/iinclude/include/snikket/PubsubEvent.h
deleted file mode 100644
index 555e1cd..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/PubsubEvent.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_PubsubEvent
-#define INCLUDED_snikket_PubsubEvent
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,PubsubEvent)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES PubsubEvent_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef PubsubEvent_obj OBJ_;
-		PubsubEvent_obj();
-
-	public:
-		enum { _hx_ClassId = 0x04e7c6de };
-
-		void __construct(::String from,::String to,::String node,::Array< ::Dynamic> items);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.PubsubEvent")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.PubsubEvent"); }
-		static ::hx::ObjectPtr< PubsubEvent_obj > __new(::String from,::String to,::String node,::Array< ::Dynamic> items);
-		static ::hx::ObjectPtr< PubsubEvent_obj > __alloc(::hx::Ctx *_hx_ctx,::String from,::String to,::String node,::Array< ::Dynamic> items);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~PubsubEvent_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("PubsubEvent",17,9e,d8,d2); }
-
-		static  ::snikket::PubsubEvent fromStanza( ::snikket::Stanza stanza);
-		static ::Dynamic fromStanza_dyn();
-
-		::String from;
-		::String to;
-		::String node;
-		::Array< ::Dynamic> items;
-		::String getFrom();
-		::Dynamic getFrom_dyn();
-
-		::String getNode();
-		::Dynamic getNode_dyn();
-
-		::Array< ::Dynamic> getItems();
-		::Dynamic getItems_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_PubsubEvent */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Reaction.h b/Sources/c_snikket/iinclude/include/snikket/Reaction.h
deleted file mode 100644
index 5c77199..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Reaction.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Reaction
-#define INCLUDED_snikket_Reaction
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Reaction)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Reaction_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Reaction_obj OBJ_;
-		Reaction_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7f8e2b4a };
-
-		void __construct(::String senderId,::String timestamp,::String text,::String envelopeId,::String key);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Reaction")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Reaction"); }
-		static ::hx::ObjectPtr< Reaction_obj > __new(::String senderId,::String timestamp,::String text,::String envelopeId,::String key);
-		static ::hx::ObjectPtr< Reaction_obj > __alloc(::hx::Ctx *_hx_ctx,::String senderId,::String timestamp,::String text,::String envelopeId,::String key);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Reaction_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Reaction",c9,a3,66,d0); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String senderId;
-		::String senderId__fromC();
-		::Dynamic senderId__fromC_dyn();
-
-		::String timestamp;
-		::String timestamp__fromC();
-		::Dynamic timestamp__fromC_dyn();
-
-		::String text;
-		::String text__fromC();
-		::Dynamic text__fromC_dyn();
-
-		::String key;
-		::String key__fromC();
-		::Dynamic key__fromC_dyn();
-
-		::String envelopeId;
-		::String envelopeId__fromC();
-		::Dynamic envelopeId__fromC_dyn();
-
-		virtual  ::Dynamic render( ::Dynamic forText, ::Dynamic forImage);
-		::Dynamic render_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Reaction */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/ReactionUpdate.h b/Sources/c_snikket/iinclude/include/snikket/ReactionUpdate.h
deleted file mode 100644
index 79c5a2a..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/ReactionUpdate.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_ReactionUpdate
-#define INCLUDED_snikket_ReactionUpdate
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Hash)
-HX_DECLARE_CLASS1(snikket,Reaction)
-HX_DECLARE_CLASS1(snikket,ReactionUpdate)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES ReactionUpdate_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ReactionUpdate_obj OBJ_;
-		ReactionUpdate_obj();
-
-	public:
-		enum { _hx_ClassId = 0x71029d2f };
-
-		void __construct(::String updateId,::String serverId,::String serverIdBy,::String localId,::String chatId,::String senderId,::String timestamp,::Array< ::Dynamic> reactions,int kind);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.ReactionUpdate")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.ReactionUpdate"); }
-		static ::hx::ObjectPtr< ReactionUpdate_obj > __new(::String updateId,::String serverId,::String serverIdBy,::String localId,::String chatId,::String senderId,::String timestamp,::Array< ::Dynamic> reactions,int kind);
-		static ::hx::ObjectPtr< ReactionUpdate_obj > __alloc(::hx::Ctx *_hx_ctx,::String updateId,::String serverId,::String serverIdBy,::String localId,::String chatId,::String senderId,::String timestamp,::Array< ::Dynamic> reactions,int kind);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ReactionUpdate_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ReactionUpdate",b2,1a,77,ad); }
-
-		::String updateId;
-		::String serverId;
-		::String serverIdBy;
-		::String localId;
-		::String chatId;
-		::String senderId;
-		::String timestamp;
-		::Array< ::Dynamic> reactions;
-		int kind;
-		::Array< ::Dynamic> getReactions(::Array< ::Dynamic> existingReactions);
-		::Dynamic getReactions_dyn();
-
-		::Array< ::Dynamic> inlineHashReferences();
-		::Dynamic inlineHashReferences_dyn();
-
-		 ::snikket::Stanza asStanza();
-		::Dynamic asStanza_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_ReactionUpdate */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/SerializedChat.h b/Sources/c_snikket/iinclude/include/snikket/SerializedChat.h
deleted file mode 100644
index 80ed386..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/SerializedChat.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_SerializedChat
-#define INCLUDED_snikket_SerializedChat
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,SerializedChat)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES SerializedChat_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SerializedChat_obj OBJ_;
-		SerializedChat_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3eb0c535 };
-
-		void __construct(::String chatId,bool trusted,::Array< unsigned char > avatarSha1, ::haxe::ds::StringMap presence,::String displayName, ::Dynamic uiState, ::Dynamic isBlocked,::String extensions,::String readUpToId,::String readUpToBy, ::Dynamic notificationsFiltered,bool notifyMention,bool notifyReply, ::snikket::Caps disco,::String klass);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.SerializedChat")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.SerializedChat"); }
-		static ::hx::ObjectPtr< SerializedChat_obj > __new(::String chatId,bool trusted,::Array< unsigned char > avatarSha1, ::haxe::ds::StringMap presence,::String displayName, ::Dynamic uiState, ::Dynamic isBlocked,::String extensions,::String readUpToId,::String readUpToBy, ::Dynamic notificationsFiltered,bool notifyMention,bool notifyReply, ::snikket::Caps disco,::String klass);
-		static ::hx::ObjectPtr< SerializedChat_obj > __alloc(::hx::Ctx *_hx_ctx,::String chatId,bool trusted,::Array< unsigned char > avatarSha1, ::haxe::ds::StringMap presence,::String displayName, ::Dynamic uiState, ::Dynamic isBlocked,::String extensions,::String readUpToId,::String readUpToBy, ::Dynamic notificationsFiltered,bool notifyMention,bool notifyReply, ::snikket::Caps disco,::String klass);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SerializedChat_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SerializedChat",9c,77,4d,09); }
-
-		::String chatId;
-		bool trusted;
-		::Array< unsigned char > avatarSha1;
-		 ::haxe::ds::StringMap presence;
-		::String displayName;
-		int uiState;
-		bool isBlocked;
-		::String extensions;
-		::String readUpToId;
-		::String readUpToBy;
-		 ::snikket::Caps disco;
-		::String klass;
-		 ::Dynamic notificationsFiltered;
-		bool notifyMention;
-		bool notifyReply;
-		 ::snikket::Chat toChat( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence);
-		::Dynamic toChat_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_SerializedChat */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Stanza.h b/Sources/c_snikket/iinclude/include/snikket/Stanza.h
deleted file mode 100644
index 7c79f8c..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Stanza.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Stanza
-#define INCLUDED_snikket_Stanza
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket__Stanza_NodeInterface
-#include <snikket/_Stanza/NodeInterface.h>
-#endif
-HX_DECLARE_CLASS0(Xml)
-HX_DECLARE_CLASS1(snikket,Node)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS1(snikket,StanzaError)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Stanza_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Stanza_obj OBJ_;
-		Stanza_obj();
-
-	public:
-		enum { _hx_ClassId = 0x62320f92 };
-
-		void __construct(::String name, ::Dynamic attr);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Stanza")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Stanza"); }
-		static ::hx::ObjectPtr< Stanza_obj > __new(::String name, ::Dynamic attr);
-		static ::hx::ObjectPtr< Stanza_obj > __alloc(::hx::Ctx *_hx_ctx,::String name, ::Dynamic attr);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Stanza_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::Dynamic traverse_881a854a( ::Dynamic f);
-		::String __ToString() const { return HX_("Stanza",15,d2,8b,3a); }
-
-		static  ::snikket::Stanza parse(::String s);
-		static ::Dynamic parse_dyn();
-
-		static  ::snikket::Stanza fromXml( ::Xml el);
-		static ::Dynamic fromXml_dyn();
-
-		static bool parseXmlBool(::String x);
-		static ::Dynamic parseXmlBool_dyn();
-
-		::String name;
-		 ::Dynamic attr;
-		::Array< ::Dynamic> children;
-		 ::snikket::Stanza last_added;
-		::Array< ::Dynamic> last_added_stack;
-		::String serialize();
-		::Dynamic serialize_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-		 ::snikket::Stanza tag(::String name, ::Dynamic attr);
-		::Dynamic tag_dyn();
-
-		 ::snikket::Stanza text(::String content);
-		::Dynamic text_dyn();
-
-		 ::snikket::Stanza textTag(::String tagName,::String textContent, ::Dynamic attr);
-		::Dynamic textTag_dyn();
-
-		 ::snikket::Stanza up();
-		::Dynamic up_dyn();
-
-		 ::snikket::Stanza reset();
-		::Dynamic reset_dyn();
-
-		 ::snikket::Stanza addChildren( ::Dynamic children);
-		::Dynamic addChildren_dyn();
-
-		 ::snikket::Stanza addChildNodes( ::Dynamic children);
-		::Dynamic addChildNodes_dyn();
-
-		 ::snikket::Stanza addChild( ::snikket::Stanza stanza);
-		::Dynamic addChild_dyn();
-
-		 ::snikket::Stanza addDirectChild( ::snikket::Node child);
-		::Dynamic addDirectChild_dyn();
-
-		 ::snikket::Stanza clone();
-		::Dynamic clone_dyn();
-
-		::Array< ::Dynamic> allTags(::String name,::String xmlns);
-		::Dynamic allTags_dyn();
-
-		::Array< ::String > allText();
-		::Dynamic allText_dyn();
-
-		 ::snikket::Stanza getFirstChild();
-		::Dynamic getFirstChild_dyn();
-
-		::Array< ::Dynamic> getChildren();
-		::Dynamic getChildren_dyn();
-
-		 ::snikket::Stanza getChild(::String name,::String xmlns);
-		::Dynamic getChild_dyn();
-
-		::String getChildText(::String name,::String xmlns);
-		::Dynamic getChildText_dyn();
-
-		::String getText();
-		::Dynamic getText_dyn();
-
-		 ::snikket::Node find(::String path);
-		::Dynamic find_dyn();
-
-		 ::snikket::Stanza findChild(::String path);
-		::Dynamic findChild_dyn();
-
-		::String findText(::String path);
-		::Dynamic findText_dyn();
-
-		 ::snikket::Stanza traverse( ::Dynamic f);
-		::Dynamic traverse_dyn();
-
-		 ::snikket::StanzaError getError();
-		::Dynamic getError_dyn();
-
-		void removeChildren(::String name,::String xmlns_);
-		::Dynamic removeChildren_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Stanza */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/StanzaError.h b/Sources/c_snikket/iinclude/include/snikket/StanzaError.h
deleted file mode 100644
index a16d52c..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/StanzaError.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_StanzaError
-#define INCLUDED_snikket_StanzaError
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_ba7467be1e1fd22b_46_new)
-HX_DECLARE_CLASS1(snikket,StanzaError)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES StanzaError_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StanzaError_obj OBJ_;
-		StanzaError_obj();
-
-	public:
-		enum { _hx_ClassId = 0x29697ad6 };
-
-		void __construct(::String type_,::String condition_,::String text_);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.StanzaError")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.StanzaError"); }
-
-		inline static ::hx::ObjectPtr< StanzaError_obj > __new(::String type_,::String condition_,::String text_) {
-			::hx::ObjectPtr< StanzaError_obj > __this = new StanzaError_obj();
-			__this->__construct(type_,condition_,text_);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< StanzaError_obj > __alloc(::hx::Ctx *_hx_ctx,::String type_,::String condition_,::String text_) {
-			StanzaError_obj *__this = (StanzaError_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(StanzaError_obj), true, "snikket.StanzaError"));
-			*(void **)__this = StanzaError_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_ba7467be1e1fd22b_46_new)
-HXLINE(  47)		( ( ::snikket::StanzaError)(__this) )->type = type_;
-HXLINE(  48)		( ( ::snikket::StanzaError)(__this) )->condition = condition_;
-HXLINE(  49)		( ( ::snikket::StanzaError)(__this) )->text = text_;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StanzaError_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("StanzaError",73,bd,30,0b); }
-
-		::String type;
-		::String condition;
-		::String text;
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_StanzaError */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/StringUtil.h b/Sources/c_snikket/iinclude/include/snikket/StringUtil.h
deleted file mode 100644
index 2aba5bb..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/StringUtil.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_StringUtil
-#define INCLUDED_snikket_StringUtil
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,StringUtil)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES StringUtil_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StringUtil_obj OBJ_;
-		StringUtil_obj();
-
-	public:
-		enum { _hx_ClassId = 0x537b2d90 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.StringUtil")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.StringUtil"); }
-
-		inline static ::hx::ObjectPtr< StringUtil_obj > __new() {
-			::hx::ObjectPtr< StringUtil_obj > __this = new StringUtil_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< StringUtil_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			StringUtil_obj *__this = (StringUtil_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(StringUtil_obj), false, "snikket.StringUtil"));
-			*(void **)__this = StringUtil_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StringUtil_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("StringUtil",93,ed,5b,f6); }
-
-		static ::Array< ::String > codepointArray(::String s);
-		static ::Dynamic codepointArray_dyn();
-
-		static ::Array< int > rawCodepointArray(::String s);
-		static ::Dynamic rawCodepointArray_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_StringUtil */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/Symbol.h b/Sources/c_snikket/iinclude/include/snikket/Symbol.h
deleted file mode 100644
index a0c352f..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/Symbol.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_Symbol
-#define INCLUDED_snikket_Symbol
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Symbol)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES Symbol_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Symbol_obj OBJ_;
-		Symbol_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4b1860f5 };
-
-		void __construct(::Array< int > codepoints);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Symbol")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Symbol"); }
-
-		//~Symbol_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Symbol",78,23,72,23); }
-
-		::String value;
-		virtual bool isEmoji() { return 0; }
-		::Dynamic isEmoji_dyn();
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_Symbol */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/TextNode.h b/Sources/c_snikket/iinclude/include/snikket/TextNode.h
deleted file mode 100644
index f290844..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/TextNode.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_TextNode
-#define INCLUDED_snikket_TextNode
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket__Stanza_NodeInterface
-#include <snikket/_Stanza/NodeInterface.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS1(snikket,TextNode)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES TextNode_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef TextNode_obj OBJ_;
-		TextNode_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3185702c };
-
-		void __construct(::String content);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.TextNode")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.TextNode"); }
-		static ::hx::ObjectPtr< TextNode_obj > __new(::String content);
-		static ::hx::ObjectPtr< TextNode_obj > __alloc(::hx::Ctx *_hx_ctx,::String content);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~TextNode_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::Dynamic traverse_881a854a( ::Dynamic f);
-		::String __ToString() const { return HX_("TextNode",6f,19,b7,25); }
-
-		::String content;
-		::String serialize();
-		::Dynamic serialize_dyn();
-
-		 ::snikket::TextNode clone();
-		::Dynamic clone_dyn();
-
-		 ::snikket::TextNode traverse( ::Dynamic f);
-		::Dynamic traverse_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_TextNode */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/UnicodeBlocks.h b/Sources/c_snikket/iinclude/include/snikket/UnicodeBlocks.h
deleted file mode 100644
index 0038254..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/UnicodeBlocks.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_UnicodeBlocks
-#define INCLUDED_snikket_UnicodeBlocks
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_UnicodeSet
-#include <snikket/UnicodeSet.h>
-#endif
-HX_DECLARE_CLASS1(snikket,UnicodeBlocks)
-HX_DECLARE_CLASS1(snikket,UnicodeSet)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES UnicodeBlocks_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef UnicodeBlocks_obj OBJ_;
-		UnicodeBlocks_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5ff5d386 };
-
-		void __construct(::Array< ::Dynamic> sets);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.UnicodeBlocks")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.UnicodeBlocks"); }
-		static ::hx::ObjectPtr< UnicodeBlocks_obj > __new(::Array< ::Dynamic> sets);
-		static ::hx::ObjectPtr< UnicodeBlocks_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< ::Dynamic> sets);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~UnicodeBlocks_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("UnicodeBlocks",63,b7,08,b4); }
-
-		::Array< ::Dynamic> unicodeSets;
-		bool contains(int codepoint);
-		::Dynamic contains_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_UnicodeBlocks */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/UnicodeList.h b/Sources/c_snikket/iinclude/include/snikket/UnicodeList.h
deleted file mode 100644
index 4ae5d96..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/UnicodeList.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_UnicodeList
-#define INCLUDED_snikket_UnicodeList
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_UnicodeSet
-#include <snikket/UnicodeSet.h>
-#endif
-HX_DECLARE_CLASS1(snikket,UnicodeList)
-HX_DECLARE_CLASS1(snikket,UnicodeSet)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES UnicodeList_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef UnicodeList_obj OBJ_;
-		UnicodeList_obj();
-
-	public:
-		enum { _hx_ClassId = 0x002205b6 };
-
-		void __construct(::Array< int > codes);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.UnicodeList")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.UnicodeList"); }
-		static ::hx::ObjectPtr< UnicodeList_obj > __new(::Array< int > codes);
-		static ::hx::ObjectPtr< UnicodeList_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< int > codes);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~UnicodeList_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("UnicodeList",fb,c3,e2,6a); }
-
-		::Array< int > list;
-		bool contains(int codepoint);
-		::Dynamic contains_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_UnicodeList */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/UnicodeRange.h b/Sources/c_snikket/iinclude/include/snikket/UnicodeRange.h
deleted file mode 100644
index 538a195..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/UnicodeRange.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_UnicodeRange
-#define INCLUDED_snikket_UnicodeRange
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_UnicodeSet
-#include <snikket/UnicodeSet.h>
-#endif
-HX_DECLARE_CLASS1(snikket,UnicodeRange)
-HX_DECLARE_CLASS1(snikket,UnicodeSet)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES UnicodeRange_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef UnicodeRange_obj OBJ_;
-		UnicodeRange_obj();
-
-	public:
-		enum { _hx_ClassId = 0x25d72cd9 };
-
-		void __construct(int lower,int upper);
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.UnicodeRange")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.UnicodeRange"); }
-		static ::hx::ObjectPtr< UnicodeRange_obj > __new(int lower,int upper);
-		static ::hx::ObjectPtr< UnicodeRange_obj > __alloc(::hx::Ctx *_hx_ctx,int lower,int upper);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~UnicodeRange_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("UnicodeRange",80,a7,a2,8a); }
-
-		int lower;
-		int upper;
-		bool contains(int codePoint);
-		::Dynamic contains_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_UnicodeRange */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/UnicodeSet.h b/Sources/c_snikket/iinclude/include/snikket/UnicodeSet.h
deleted file mode 100644
index 1f6c00a..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/UnicodeSet.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_UnicodeSet
-#define INCLUDED_snikket_UnicodeSet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,UnicodeSet)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES UnicodeSet_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		bool (::hx::Object :: *_hx_contains)(int codepoint); 
-		static inline bool contains( ::Dynamic _hx_,int codepoint) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::UnicodeSet_obj *>(_hx_.mPtr->_hx_getInterface(0x29205162)))->_hx_contains)(codepoint);
-		}
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_UnicodeSet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/XEP0393.h b/Sources/c_snikket/iinclude/include/snikket/XEP0393.h
deleted file mode 100644
index 3af9b96..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/XEP0393.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_XEP0393
-#define INCLUDED_snikket_XEP0393
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Node)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS1(snikket,XEP0393)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-
-
-class HXCPP_CLASS_ATTRIBUTES XEP0393_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef XEP0393_obj OBJ_;
-		XEP0393_obj();
-
-	public:
-		enum { _hx_ClassId = 0x794b61b7 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.XEP0393")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.XEP0393"); }
-
-		inline static ::hx::ObjectPtr< XEP0393_obj > __new() {
-			::hx::ObjectPtr< XEP0393_obj > __this = new XEP0393_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< XEP0393_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			XEP0393_obj *__this = (XEP0393_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(XEP0393_obj), false, "snikket.XEP0393"));
-			*(void **)__this = XEP0393_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~XEP0393_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("XEP0393",e0,42,f0,11); }
-
-		static  ::Dynamic parse(::String styled);
-		static ::Dynamic parse_dyn();
-
-		static ::String render( ::snikket::Stanza xhtml);
-		static ::Dynamic render_dyn();
-
-		static ::String renderNode( ::snikket::Node xhtml);
-		static ::Dynamic renderNode_dyn();
-
-		static  ::Dynamic parseSpans(::String styled);
-		static ::Dynamic parseSpans_dyn();
-
-		static  ::Dynamic parseSpan(::String tagName,::String marker,::String styled,int start);
-		static ::Dynamic parseSpan_dyn();
-
-		static  ::Dynamic parseBlock(::String styled);
-		static ::Dynamic parseBlock_dyn();
-
-		static  ::Dynamic parseQuote(::String styled);
-		static ::Dynamic parseQuote_dyn();
-
-		static  ::Dynamic parsePreformatted(::String styled);
-		static ::Dynamic parsePreformatted_dyn();
-
-};
-
-} // end namespace snikket
-
-#endif /* INCLUDED_snikket_XEP0393 */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/_Push/Push_Fields_.h b/Sources/c_snikket/iinclude/include/snikket/_Push/Push_Fields_.h
deleted file mode 100644
index 27e14f5..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/_Push/Push_Fields_.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket__Push_Push_Fields_
-#define INCLUDED_snikket__Push_Push_Fields_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Notification)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS2(snikket,_Push,Push_Fields_)
-
-namespace snikket{
-namespace _Push{
-
-
-class HXCPP_CLASS_ATTRIBUTES Push_Fields__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Push_Fields__obj OBJ_;
-		Push_Fields__obj();
-
-	public:
-		enum { _hx_ClassId = 0x1c9e72a5 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket._Push.Push_Fields_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket._Push.Push_Fields_"); }
-
-		inline static ::hx::ObjectPtr< Push_Fields__obj > __new() {
-			::hx::ObjectPtr< Push_Fields__obj > __this = new Push_Fields__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Push_Fields__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Push_Fields__obj *__this = (Push_Fields__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Push_Fields__obj), false, "snikket._Push.Push_Fields_"));
-			*(void **)__this = Push_Fields__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Push_Fields__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Push_Fields_",21,65,37,88); }
-
-		static  ::snikket::Notification receive(::String data,::Dynamic persistence);
-		static ::Dynamic receive_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace _Push
-
-#endif /* INCLUDED_snikket__Push_Push_Fields_ */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/_Stanza/NodeInterface.h b/Sources/c_snikket/iinclude/include/snikket/_Stanza/NodeInterface.h
deleted file mode 100644
index 8a96ae8..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/_Stanza/NodeInterface.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket__Stanza_NodeInterface
-#define INCLUDED_snikket__Stanza_NodeInterface
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-
-namespace snikket{
-namespace _Stanza{
-
-
-class HXCPP_CLASS_ATTRIBUTES NodeInterface_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		::String (::hx::Object :: *_hx_serialize)(); 
-		static inline ::String serialize( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::_Stanza::NodeInterface_obj *>(_hx_.mPtr->_hx_getInterface(0xc837e580)))->_hx_serialize)();
-		}
-		::Dynamic (::hx::Object :: *_hx_traverse)( ::Dynamic f); 
-		static inline ::Dynamic traverse( ::Dynamic _hx_, ::Dynamic f) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::_Stanza::NodeInterface_obj *>(_hx_.mPtr->_hx_getInterface(0xc837e580)))->_hx_traverse)(f);
-		}
-};
-
-} // end namespace snikket
-} // end namespace _Stanza
-
-#endif /* INCLUDED_snikket__Stanza_NodeInterface */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/_Util/Util_Fields_.h b/Sources/c_snikket/iinclude/include/snikket/_Util/Util_Fields_.h
deleted file mode 100644
index a5a7fd3..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/_Util/Util_Fields_.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket__Util_Util_Fields_
-#define INCLUDED_snikket__Util_Util_Fields_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(snikket,_Util,Util_Fields_)
-
-namespace snikket{
-namespace _Util{
-
-
-class HXCPP_CLASS_ATTRIBUTES Util_Fields__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Util_Fields__obj OBJ_;
-		Util_Fields__obj();
-
-	public:
-		enum { _hx_ClassId = 0x1266dcf5 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket._Util.Util_Fields_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket._Util.Util_Fields_"); }
-
-		inline static ::hx::ObjectPtr< Util_Fields__obj > __new() {
-			::hx::ObjectPtr< Util_Fields__obj > __this = new Util_Fields__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Util_Fields__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Util_Fields__obj *__this = (Util_Fields__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Util_Fields__obj), false, "snikket._Util.Util_Fields_"));
-			*(void **)__this = Util_Fields__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Util_Fields__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Util_Fields_",49,13,f3,18); }
-
-		static void setupTrace();
-		static ::Dynamic setupTrace_dyn();
-
-		static  ::Dynamic downcast( ::Dynamic value,::hx::Class c);
-		static ::Dynamic downcast_dyn();
-
-		static ::String xmlEscape(::String s);
-		static ::Dynamic xmlEscape_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace _Util
-
-#endif /* INCLUDED_snikket__Util_Util_Fields_ */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/Attribute.h b/Sources/c_snikket/iinclude/include/snikket/jingle/Attribute.h
deleted file mode 100644
index ab36337..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/Attribute.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_Attribute
-#define INCLUDED_snikket_jingle_Attribute
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_3dd2db7f2124ae96_624_new)
-HX_DECLARE_CLASS2(snikket,jingle,Attribute)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES Attribute_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Attribute_obj OBJ_;
-		Attribute_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0704634e };
-
-		void __construct(::String key,::String value);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.Attribute")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.Attribute"); }
-
-		inline static ::hx::ObjectPtr< Attribute_obj > __new(::String key,::String value) {
-			::hx::ObjectPtr< Attribute_obj > __this = new Attribute_obj();
-			__this->__construct(key,value);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Attribute_obj > __alloc(::hx::Ctx *_hx_ctx,::String key,::String value) {
-			Attribute_obj *__this = (Attribute_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Attribute_obj), true, "snikket.jingle.Attribute"));
-			*(void **)__this = Attribute_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_3dd2db7f2124ae96_624_new)
-HXLINE( 625)		( ( ::snikket::jingle::Attribute)(__this) )->key = key;
-HXLINE( 626)		( ( ::snikket::jingle::Attribute)(__this) )->value = value;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Attribute_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Attribute",fc,4f,c3,9c); }
-
-		static  ::snikket::jingle::Attribute parse(::String input);
-		static ::Dynamic parse_dyn();
-
-		::String key;
-		::String value;
-		::String toSdp();
-		::Dynamic toSdp_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_Attribute */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/AudioFormat.h b/Sources/c_snikket/iinclude/include/snikket/jingle/AudioFormat.h
deleted file mode 100644
index 5a01544..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/AudioFormat.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_AudioFormat
-#define INCLUDED_snikket_jingle_AudioFormat
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_1f09f7dcf750977c_327_new)
-HX_DECLARE_CLASS2(snikket,jingle,AudioFormat)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES AudioFormat_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef AudioFormat_obj OBJ_;
-		AudioFormat_obj();
-
-	public:
-		enum { _hx_ClassId = 0x22a1d3c3 };
-
-		void __construct(::String format,unsigned char payloadType,int clockRate,int channels);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.AudioFormat")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.AudioFormat"); }
-
-		inline static ::hx::ObjectPtr< AudioFormat_obj > __new(::String format,unsigned char payloadType,int clockRate,int channels) {
-			::hx::ObjectPtr< AudioFormat_obj > __this = new AudioFormat_obj();
-			__this->__construct(format,payloadType,clockRate,channels);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< AudioFormat_obj > __alloc(::hx::Ctx *_hx_ctx,::String format,unsigned char payloadType,int clockRate,int channels) {
-			AudioFormat_obj *__this = (AudioFormat_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(AudioFormat_obj), true, "snikket.jingle.AudioFormat"));
-			*(void **)__this = AudioFormat_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_1f09f7dcf750977c_327_new)
-HXLINE( 328)		( ( ::snikket::jingle::AudioFormat)(__this) )->format = format;
-HXLINE( 329)		( ( ::snikket::jingle::AudioFormat)(__this) )->payloadType = payloadType;
-HXLINE( 330)		( ( ::snikket::jingle::AudioFormat)(__this) )->clockRate = clockRate;
-HXLINE( 331)		( ( ::snikket::jingle::AudioFormat)(__this) )->channels = channels;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~AudioFormat_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("AudioFormat",8d,58,71,b0); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String format;
-		unsigned char payloadType;
-		int clockRate;
-		int clockRate__fromC();
-		::Dynamic clockRate__fromC_dyn();
-
-		int channels;
-		int channels__fromC();
-		::Dynamic channels__fromC_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_AudioFormat */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/DTMFSender.h b/Sources/c_snikket/iinclude/include/snikket/jingle/DTMFSender.h
deleted file mode 100644
index ac11f9b..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/DTMFSender.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_DTMFSender
-#define INCLUDED_snikket_jingle_DTMFSender
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS1(haxe,Timer)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS2(snikket,jingle,DTMFSender)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES DTMFSender_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef DTMFSender_obj OBJ_;
-		DTMFSender_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0cd227ec };
-
-		void __construct( ::snikket::jingle::MediaStreamTrack track);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.DTMFSender")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.DTMFSender"); }
-		static ::hx::ObjectPtr< DTMFSender_obj > __new( ::snikket::jingle::MediaStreamTrack track);
-		static ::hx::ObjectPtr< DTMFSender_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::jingle::MediaStreamTrack track);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DTMFSender_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DTMFSender",7e,53,22,7e); }
-
-		static void __boot();
-		static  ::haxe::ds::StringMap TONES;
-		 ::snikket::jingle::MediaStreamTrack track;
-		 ::haxe::Timer timer;
-		::Array< unsigned char > tones;
-		void insertDTMF(::String tones);
-		::Dynamic insertDTMF_dyn();
-
-		void insertOneTone(unsigned char tone);
-		::Dynamic insertOneTone_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_DTMFSender */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/Group.h b/Sources/c_snikket/iinclude/include/snikket/jingle/Group.h
deleted file mode 100644
index e94b018..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/Group.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_Group
-#define INCLUDED_snikket_jingle_Group
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,Group)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES Group_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Group_obj OBJ_;
-		Group_obj();
-
-	public:
-		enum { _hx_ClassId = 0x21f1b1d5 };
-
-		void __construct(::String semantics,::Array< ::String > identificationTags);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.Group")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.Group"); }
-		static ::hx::ObjectPtr< Group_obj > __new(::String semantics,::Array< ::String > identificationTags);
-		static ::hx::ObjectPtr< Group_obj > __alloc(::hx::Ctx *_hx_ctx,::String semantics,::Array< ::String > identificationTags);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Group_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Group",1f,23,22,2d); }
-
-		static  ::snikket::jingle::Group parse(::String input);
-		static ::Dynamic parse_dyn();
-
-		static  ::snikket::jingle::Group fromElement( ::snikket::Stanza el);
-		static ::Dynamic fromElement_dyn();
-
-		::String semantics;
-		::Array< ::String > identificationTags;
-		::String toSdp();
-		::Dynamic toSdp_dyn();
-
-		 ::snikket::Stanza toElement();
-		::Dynamic toElement_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_Group */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/IceCandidate.h b/Sources/c_snikket/iinclude/include/snikket/jingle/IceCandidate.h
deleted file mode 100644
index 3f6d0f8..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/IceCandidate.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_IceCandidate
-#define INCLUDED_snikket_jingle_IceCandidate
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,IceCandidate)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES IceCandidate_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef IceCandidate_obj OBJ_;
-		IceCandidate_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5f466786 };
-
-		void __construct(::String sdpMid,::String ufrag,::String foundation,::String component,::String transport,::String priority,::String connectionAddress,::String port, ::haxe::ds::StringMap parameters);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.IceCandidate")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.IceCandidate"); }
-		static ::hx::ObjectPtr< IceCandidate_obj > __new(::String sdpMid,::String ufrag,::String foundation,::String component,::String transport,::String priority,::String connectionAddress,::String port, ::haxe::ds::StringMap parameters);
-		static ::hx::ObjectPtr< IceCandidate_obj > __alloc(::hx::Ctx *_hx_ctx,::String sdpMid,::String ufrag,::String foundation,::String component,::String transport,::String priority,::String connectionAddress,::String port, ::haxe::ds::StringMap parameters);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IceCandidate_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IceCandidate",98,1b,a6,e5); }
-
-		static  ::snikket::jingle::IceCandidate fromElement( ::snikket::Stanza candidate,::String sdpMid,::String ufrag);
-		static ::Dynamic fromElement_dyn();
-
-		static ::Array< ::Dynamic> fromTransport( ::snikket::Stanza transport,::String sdpMid);
-		static ::Dynamic fromTransport_dyn();
-
-		static ::Array< ::Dynamic> fromStanza( ::snikket::Stanza iq);
-		static ::Dynamic fromStanza_dyn();
-
-		static  ::snikket::jingle::IceCandidate parse(::String input,::String sdpMid,::String ufrag);
-		static ::Dynamic parse_dyn();
-
-		::String sdpMid;
-		::String ufrag;
-		::String foundation;
-		::String component;
-		::String transport;
-		::String priority;
-		::String connectionAddress;
-		::String port;
-		 ::haxe::ds::StringMap parameters;
-		 ::snikket::Stanza toElement();
-		::Dynamic toElement_dyn();
-
-		::String toSdp();
-		::Dynamic toSdp_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_IceCandidate */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/IncomingProposedSession.h b/Sources/c_snikket/iinclude/include/snikket/jingle/IncomingProposedSession.h
deleted file mode 100644
index ba3b24a..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/IncomingProposedSession.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_IncomingProposedSession
-#define INCLUDED_snikket_jingle_IncomingProposedSession
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_jingle_Session
-#include <snikket/jingle/Session.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,DTMFSender)
-HX_DECLARE_CLASS2(snikket,jingle,IncomingProposedSession)
-HX_DECLARE_CLASS2(snikket,jingle,InitiatedSession)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(snikket,jingle,Session)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES IncomingProposedSession_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef IncomingProposedSession_obj OBJ_;
-		IncomingProposedSession_obj();
-
-	public:
-		enum { _hx_ClassId = 0x409e1620 };
-
-		void __construct( ::snikket::Client client, ::snikket::JID from,::String sid);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.IncomingProposedSession")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.IncomingProposedSession"); }
-		static ::hx::ObjectPtr< IncomingProposedSession_obj > __new( ::snikket::Client client, ::snikket::JID from,::String sid);
-		static ::hx::ObjectPtr< IncomingProposedSession_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::JID from,::String sid);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IncomingProposedSession_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("IncomingProposedSession",ea,a1,86,13); }
-
-		::String sid;
-		 ::snikket::Client client;
-		 ::snikket::JID from;
-		::String _sid;
-		bool accepted;
-		void ring();
-		::Dynamic ring_dyn();
-
-		void hangup();
-		::Dynamic hangup_dyn();
-
-		void retract();
-		::Dynamic retract_dyn();
-
-		void terminate();
-		::Dynamic terminate_dyn();
-
-		void contentAdd( ::snikket::Stanza _);
-		::Dynamic contentAdd_dyn();
-
-		void contentAccept( ::snikket::Stanza _);
-		::Dynamic contentAccept_dyn();
-
-		::Dynamic transportInfo( ::snikket::Stanza _);
-		::Dynamic transportInfo_dyn();
-
-		void accept();
-		::Dynamic accept_dyn();
-
-		 ::snikket::jingle::InitiatedSession initiate( ::snikket::Stanza stanza);
-		::Dynamic initiate_dyn();
-
-		void addMedia(::Array< ::Dynamic> _);
-		::Dynamic addMedia_dyn();
-
-		::String callStatus();
-		::Dynamic callStatus_dyn();
-
-		::Array< ::Dynamic> videoTracks();
-		::Dynamic videoTracks_dyn();
-
-		 ::snikket::jingle::DTMFSender dtmf();
-		::Dynamic dtmf_dyn();
-
-		::String get_sid();
-		::Dynamic get_sid_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_IncomingProposedSession */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/InitiatedSession.h b/Sources/c_snikket/iinclude/include/snikket/jingle/InitiatedSession.h
deleted file mode 100644
index 569256c..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/InitiatedSession.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_InitiatedSession
-#define INCLUDED_snikket_jingle_InitiatedSession
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_jingle_Session
-#include <snikket/jingle/Session.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,DTMFSender)
-HX_DECLARE_CLASS2(snikket,jingle,InitiatedSession)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(snikket,jingle,OutgoingSession)
-HX_DECLARE_CLASS2(snikket,jingle,PeerConnection)
-HX_DECLARE_CLASS2(snikket,jingle,Session)
-HX_DECLARE_CLASS2(snikket,jingle,SessionDescription)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES InitiatedSession_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef InitiatedSession_obj OBJ_;
-		InitiatedSession_obj();
-
-	public:
-		enum { _hx_ClassId = 0x050f75b9 };
-
-		void __construct( ::snikket::Client client, ::snikket::JID counterpart,::String sid, ::snikket::jingle::SessionDescription remoteDescription);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.InitiatedSession")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.InitiatedSession"); }
-		static ::hx::ObjectPtr< InitiatedSession_obj > __new( ::snikket::Client client, ::snikket::JID counterpart,::String sid, ::snikket::jingle::SessionDescription remoteDescription);
-		static ::hx::ObjectPtr< InitiatedSession_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::JID counterpart,::String sid, ::snikket::jingle::SessionDescription remoteDescription);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~InitiatedSession_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		 ::snikket::jingle::InitiatedSession initiate_ef691953( ::snikket::Stanza stanza);
-		::String __ToString() const { return HX_("InitiatedSession",cb,9a,8f,24); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::jingle::InitiatedSession fromSessionInitiate( ::snikket::Client client, ::snikket::Stanza stanza);
-		static ::Dynamic fromSessionInitiate_dyn();
-
-		::String sid;
-		::String sid__fromC();
-		::Dynamic sid__fromC_dyn();
-
-		 ::snikket::Client client;
-		 ::snikket::JID counterpart;
-		::String _sid;
-		 ::snikket::jingle::SessionDescription remoteDescription;
-		 ::snikket::jingle::SessionDescription localDescription;
-		 ::snikket::jingle::PeerConnection pc;
-		::String peerDtlsSetup;
-		::Array< ::Dynamic> queuedInboundTransportInfo;
-		::Array< ::Dynamic> queuedOutboundCandidate;
-		bool accepted;
-		 ::Dynamic afterMedia;
-		Dynamic afterMedia_dyn() { return afterMedia;}
-		bool initiator;
-		 ::Dynamic candidatesDone;
-		Dynamic candidatesDone_dyn() { return candidatesDone;}
-		::String get_sid();
-		::Dynamic get_sid_dyn();
-
-		void ring();
-		::Dynamic ring_dyn();
-
-		void retract();
-		::Dynamic retract_dyn();
-
-		void accept();
-		::Dynamic accept_dyn();
-
-		void hangup();
-		::Dynamic hangup_dyn();
-
-		virtual  ::snikket::jingle::OutgoingSession initiate( ::snikket::Stanza stanza);
-		::Dynamic initiate_dyn();
-
-		void terminate();
-		::Dynamic terminate_dyn();
-
-		void contentAdd( ::snikket::Stanza stanza);
-		::Dynamic contentAdd_dyn();
-
-		void contentAccept( ::snikket::Stanza stanza);
-		::Dynamic contentAccept_dyn();
-
-		::Dynamic transportInfo( ::snikket::Stanza stanza);
-		::Dynamic transportInfo_dyn();
-
-		void addMedia(::Array< ::Dynamic> streams);
-		::Dynamic addMedia_dyn();
-
-		void addMedia__fromC(::cpp::Pointer< void* > streams,size_t streams__len);
-		::Dynamic addMedia__fromC_dyn();
-
-		::String callStatus();
-		::Dynamic callStatus_dyn();
-
-		::Array< ::Dynamic> videoTracks();
-		::Dynamic videoTracks_dyn();
-
-		size_t videoTracks__fromC(void*** outPtr);
-
-		 ::snikket::jingle::DTMFSender dtmf();
-		::Dynamic dtmf_dyn();
-
-		void sendIceCandidate( ::Dynamic candidate);
-		::Dynamic sendIceCandidate_dyn();
-
-		void supplyMedia(::Array< ::Dynamic> streams);
-		::Dynamic supplyMedia_dyn();
-
-		void supplyMedia__fromC(::cpp::Pointer< void* > streams,size_t streams__len);
-		::Dynamic supplyMedia__fromC_dyn();
-
-		void setupPeerConnection( ::Dynamic callback);
-		::Dynamic setupPeerConnection_dyn();
-
-		::Dynamic setupLocalDescription(::String type,::Array< ::String > filterMedia, ::Dynamic filterOut, ::Dynamic beforeSend);
-		::Dynamic setupLocalDescription_dyn();
-
-		virtual ::Dynamic onPeerConnection();
-		::Dynamic onPeerConnection_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_InitiatedSession */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/Media.h b/Sources/c_snikket/iinclude/include/snikket/jingle/Media.h
deleted file mode 100644
index 139653a..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/Media.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_Media
-#define INCLUDED_snikket_jingle_Media
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,Attribute)
-HX_DECLARE_CLASS2(snikket,jingle,Media)
-HX_DECLARE_CLASS2(snikket,jingle,SessionDescription)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES Media_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Media_obj OBJ_;
-		Media_obj();
-
-	public:
-		enum { _hx_ClassId = 0x06e5f716 };
-
-		void __construct(::String mid,::String media,::String connectionData,::String port,::String protocol,::Array< ::Dynamic> attributes,::Array< int > formats);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.Media")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.Media"); }
-		static ::hx::ObjectPtr< Media_obj > __new(::String mid,::String media,::String connectionData,::String port,::String protocol,::Array< ::Dynamic> attributes,::Array< int > formats);
-		static ::hx::ObjectPtr< Media_obj > __alloc(::hx::Ctx *_hx_ctx,::String mid,::String media,::String connectionData,::String port,::String protocol,::Array< ::Dynamic> attributes,::Array< int > formats);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Media_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Media",c4,74,e9,98); }
-
-		static  ::snikket::jingle::Media fromElement( ::snikket::Stanza content,bool initiator,bool hasGroup, ::snikket::jingle::SessionDescription existingDescription);
-		static ::Dynamic fromElement_dyn();
-
-		::String mid;
-		::String media;
-		::String connectionData;
-		::String port;
-		::String protocol;
-		::Array< ::Dynamic> attributes;
-		::Array< int > formats;
-		::String toSdp();
-		::Dynamic toSdp_dyn();
-
-		 ::snikket::Stanza contentElement(bool initiator);
-		::Dynamic contentElement_dyn();
-
-		 ::snikket::Stanza toElement(::Array< ::Dynamic> sessionAttributes,bool initiator);
-		::Dynamic toElement_dyn();
-
-		 ::Dynamic getUfragPwd(::Array< ::Dynamic> sessionAttributes);
-		::Dynamic getUfragPwd_dyn();
-
-		 ::snikket::Stanza toTransportElement(::Array< ::Dynamic> sessionAttributes);
-		::Dynamic toTransportElement_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_Media */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/MediaStream.h b/Sources/c_snikket/iinclude/include/snikket/jingle/MediaStream.h
deleted file mode 100644
index 1e4bb42..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/MediaStream.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_MediaStream
-#define INCLUDED_snikket_jingle_MediaStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES MediaStream_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MediaStream_obj OBJ_;
-		MediaStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1cdfd2fe };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.MediaStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.MediaStream"); }
-		static ::hx::ObjectPtr< MediaStream_obj > __new();
-		static ::hx::ObjectPtr< MediaStream_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MediaStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MediaStream",64,e8,a8,83); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::jingle::MediaStream makeAudio();
-		static ::Dynamic makeAudio_dyn();
-
-		::Array< ::Dynamic> tracks;
-		void addTrack( ::snikket::jingle::MediaStreamTrack track);
-		::Dynamic addTrack_dyn();
-
-		::Array< ::Dynamic> getTracks();
-		::Dynamic getTracks_dyn();
-
-		size_t getTracks__fromC(void*** outPtr);
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_MediaStream */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/MediaStreamTrack.h b/Sources/c_snikket/iinclude/include/snikket/jingle/MediaStreamTrack.h
deleted file mode 100644
index 368efe0..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/MediaStreamTrack.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_MediaStreamTrack
-#define INCLUDED_snikket_jingle_MediaStreamTrack
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_f561c66e4c8ac38c
-#define INCLUDED_f561c66e4c8ac38c
-#include "fstream"
-#endif
-#ifndef INCLUDED_c2bfbc5a172f2993
-#define INCLUDED_c2bfbc5a172f2993
-#include "opus.h"
-#endif
-#ifndef INCLUDED_639eed8ef5b51d52
-#define INCLUDED_639eed8ef5b51d52
-#include "rtc/frameinfo.hpp"
-#endif
-#ifndef INCLUDED_0e487a29b6aa8a9b
-#define INCLUDED_0e487a29b6aa8a9b
-#include "rtc/rtc.hpp"
-#endif
-HX_DECLARE_CLASS1(haxe,Timer)
-HX_DECLARE_CLASS2(snikket,jingle,AudioFormat)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(sys,thread,EventLoop)
-HX_DECLARE_CLASS2(sys,thread,Mutex)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES MediaStreamTrack_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MediaStreamTrack_obj OBJ_;
-		MediaStreamTrack_obj();
-
-	public:
-		enum { _hx_ClassId = 0x047992ad };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.MediaStreamTrack")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.MediaStreamTrack"); }
-		static ::hx::ObjectPtr< MediaStreamTrack_obj > __new();
-		static ::hx::ObjectPtr< MediaStreamTrack_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MediaStreamTrack_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MediaStreamTrack",87,2b,0b,ac); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		static  ::snikket::jingle::MediaStreamTrack fromTrack( std::shared_ptr<  rtc::Track > t);
-
-		static ::Array< short > ULAW_DECODE;
-		static ::Array< unsigned char > ULAW_EXP;
-		static unsigned char pcmToUlaw(short sample);
-		static ::Dynamic pcmToUlaw_dyn();
-
-		::String id__fromC();
-		::Dynamic id__fromC_dyn();
-
-		bool muted__fromC();
-		::Dynamic muted__fromC_dyn();
-
-		::String kind__fromC();
-		::Dynamic kind__fromC_dyn();
-
-		size_t supportedAudioFormats__fromC(void*** outPtr);
-
-		 ::Dynamic pcmCallback;
-		Dynamic pcmCallback_dyn() { return pcmCallback;}
-		 ::Dynamic readyForPCMCallback;
-		Dynamic readyForPCMCallback_dyn() { return readyForPCMCallback;}
-		cpp::Struct<  OpusDecoder* > opus;
-		cpp::Struct<  OpusEncoder* > opusEncoder;
-		 std::shared_ptr<  rtc::RtpPacketizationConfig > rtpPacketizationConfig;
-		 ::sys::thread::EventLoop eventLoop;
-		 ::haxe::Timer timer;
-		::Array< ::Dynamic> audioQ;
-		bool alive;
-		bool waitForQ;
-		Float bufferSizeInSeconds;
-		 ::sys::thread::Mutex mutex;
-		 std::optional<  rtc::Description::Media > media;
-		 std::shared_ptr<  rtc::Track > track;
-		 std::optional<  rtc::Description::Media > get_media();
-
-		::String get_id();
-		::Dynamic get_id_dyn();
-
-		::String get_kind();
-		::Dynamic get_kind_dyn();
-
-		bool get_muted();
-		::Dynamic get_muted_dyn();
-
-		::Array< ::Dynamic> get_supportedAudioFormats();
-		::Dynamic get_supportedAudioFormats_dyn();
-
-		 std::shared_ptr<  rtc::Track > set_track( std::shared_ptr<  rtc::Track > newTrack);
-
-		void addPCMListener( ::Dynamic callback);
-		::Dynamic addPCMListener_dyn();
-
-		void addPCMListener__fromC(::cpp::Function< void  (short*,size_t,int,int,void*) > callback,void* callback__context);
-
-		void onFrame( std::vector<  std::byte > msg, rtc::FrameInfo frameInfo);
-
-		void addReadyForPCMListener( ::Dynamic callback);
-		::Dynamic addReadyForPCMListener_dyn();
-
-		void addReadyForPCMListener__fromC(::cpp::Function< void  (void*) > callback,void* callback__context);
-
-		void notifyReadyForData(bool fromCPP);
-		::Dynamic notifyReadyForData_dyn();
-
-		void writePCM(::Array< short > pcm,int clockRate,int channels);
-		::Dynamic writePCM_dyn();
-
-		void writePCM__fromC(::cpp::Pointer< short > pcm,size_t pcm__len,int clockRate,int channels);
-		::Dynamic writePCM__fromC_dyn();
-
-		void onAudioLoop( ::Dynamic callback);
-		::Dynamic onAudioLoop_dyn();
-
-		void write(::Array< unsigned char > payload,unsigned char payloadType,int clockRate);
-		::Dynamic write_dyn();
-
-		void advanceTimestamp(int samples);
-		::Dynamic advanceTimestamp_dyn();
-
-		void stop();
-		::Dynamic stop_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_MediaStreamTrack */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/OutgoingProposedSession.h b/Sources/c_snikket/iinclude/include/snikket/jingle/OutgoingProposedSession.h
deleted file mode 100644
index 04be360..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/OutgoingProposedSession.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_OutgoingProposedSession
-#define INCLUDED_snikket_jingle_OutgoingProposedSession
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_jingle_Session
-#include <snikket/jingle/Session.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,DTMFSender)
-HX_DECLARE_CLASS2(snikket,jingle,InitiatedSession)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(snikket,jingle,OutgoingProposedSession)
-HX_DECLARE_CLASS2(snikket,jingle,OutgoingSession)
-HX_DECLARE_CLASS2(snikket,jingle,Session)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES OutgoingProposedSession_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef OutgoingProposedSession_obj OBJ_;
-		OutgoingProposedSession_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4349a55a };
-
-		void __construct( ::snikket::Client client, ::snikket::JID to);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.OutgoingProposedSession")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.OutgoingProposedSession"); }
-		static ::hx::ObjectPtr< OutgoingProposedSession_obj > __new( ::snikket::Client client, ::snikket::JID to);
-		static ::hx::ObjectPtr< OutgoingProposedSession_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::JID to);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~OutgoingProposedSession_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		 ::snikket::jingle::InitiatedSession initiate_ef691953( ::snikket::Stanza stanza);
-		::String __ToString() const { return HX_("OutgoingProposedSession",24,31,32,16); }
-
-		::String sid;
-		 ::snikket::Client client;
-		 ::snikket::JID to;
-		::String _sid;
-		bool audio;
-		bool video;
-		void propose(bool audio,bool video);
-		::Dynamic propose_dyn();
-
-		void hangup();
-		::Dynamic hangup_dyn();
-
-		void retract();
-		::Dynamic retract_dyn();
-
-		void terminate();
-		::Dynamic terminate_dyn();
-
-		void contentAdd( ::snikket::Stanza _);
-		::Dynamic contentAdd_dyn();
-
-		void contentAccept( ::snikket::Stanza _);
-		::Dynamic contentAccept_dyn();
-
-		::Dynamic transportInfo( ::snikket::Stanza _);
-		::Dynamic transportInfo_dyn();
-
-		void accept();
-		::Dynamic accept_dyn();
-
-		 ::snikket::jingle::OutgoingSession initiate( ::snikket::Stanza stanza);
-		::Dynamic initiate_dyn();
-
-		void addMedia(::Array< ::Dynamic> _);
-		::Dynamic addMedia_dyn();
-
-		::String callStatus();
-		::Dynamic callStatus_dyn();
-
-		::Array< ::Dynamic> videoTracks();
-		::Dynamic videoTracks_dyn();
-
-		 ::snikket::jingle::DTMFSender dtmf();
-		::Dynamic dtmf_dyn();
-
-		::String get_sid();
-		::Dynamic get_sid_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_OutgoingProposedSession */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/OutgoingSession.h b/Sources/c_snikket/iinclude/include/snikket/jingle/OutgoingSession.h
deleted file mode 100644
index 80cffde..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/OutgoingSession.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_OutgoingSession
-#define INCLUDED_snikket_jingle_OutgoingSession
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_jingle_InitiatedSession
-#include <snikket/jingle/InitiatedSession.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Client)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,InitiatedSession)
-HX_DECLARE_CLASS2(snikket,jingle,OutgoingSession)
-HX_DECLARE_CLASS2(snikket,jingle,Session)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES OutgoingSession_obj : public  ::snikket::jingle::InitiatedSession_obj
-{
-	public:
-		typedef  ::snikket::jingle::InitiatedSession_obj super;
-		typedef OutgoingSession_obj OBJ_;
-		OutgoingSession_obj();
-
-	public:
-		enum { _hx_ClassId = 0x43b8b0fc };
-
-		void __construct( ::snikket::Client client, ::snikket::JID counterpart,::String sid);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.OutgoingSession")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.OutgoingSession"); }
-		static ::hx::ObjectPtr< OutgoingSession_obj > __new( ::snikket::Client client, ::snikket::JID counterpart,::String sid);
-		static ::hx::ObjectPtr< OutgoingSession_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::Client client, ::snikket::JID counterpart,::String sid);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~OutgoingSession_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("OutgoingSession",2a,54,07,c9); }
-
-		::Dynamic onPeerConnection();
-
-		 ::snikket::jingle::OutgoingSession initiate( ::snikket::Stanza stanza);
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_OutgoingSession */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/PeerConnection.h b/Sources/c_snikket/iinclude/include/snikket/jingle/PeerConnection.h
deleted file mode 100644
index 44a1ee9..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/PeerConnection.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_PeerConnection
-#define INCLUDED_snikket_jingle_PeerConnection
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_0e487a29b6aa8a9b
-#define INCLUDED_0e487a29b6aa8a9b
-#include "rtc/rtc.hpp"
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(snikket,jingle,PeerConnection)
-HX_DECLARE_CLASS2(sys,thread,EventLoop)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES PeerConnection_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef PeerConnection_obj OBJ_;
-		PeerConnection_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1731230a };
-
-		void __construct( ::Dynamic configuration, ::Dynamic constraints);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.PeerConnection")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.PeerConnection"); }
-		static ::hx::ObjectPtr< PeerConnection_obj > __new( ::Dynamic configuration, ::Dynamic constraints);
-		static ::hx::ObjectPtr< PeerConnection_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic configuration, ::Dynamic constraints);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~PeerConnection_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("PeerConnection",80,38,71,9a); }
-
-		 ::Dynamic localDescription;
-		::String connectionState;
-		 std::shared_ptr<  rtc::PeerConnection > _pc;
-		::cpp::Pointer<  rtc::PeerConnection > pc;
-		 ::Dynamic waitingOnLocal;
-		Dynamic waitingOnLocal_dyn() { return waitingOnLocal;}
-		 ::haxe::ds::StringMap tracks;
-		::Array< ::Dynamic> trackListeners;
-		::Array< ::Dynamic> localCandidateListeners;
-		::Array< ::Dynamic> stateChangeListeners;
-		 ::sys::thread::EventLoop mainLoop;
-		bool hasLocal;
-		bool hasRemote;
-		::Array< ::Dynamic> pendingTracks;
-		void onLocalDescription();
-		::Dynamic onLocalDescription_dyn();
-
-		void onLocalCandidate( rtc::Candidate candidate);
-
-		void onStateChange(cpp::Struct<  rtc::PeerConnection::State > state);
-		::Dynamic onStateChange_dyn();
-
-		void onGatheringStateChange(cpp::Struct<  rtc::PeerConnection::GatheringState > state);
-		::Dynamic onGatheringStateChange_dyn();
-
-		void onTrack( std::shared_ptr<  rtc::Track > track);
-
-		::String get_connectionState();
-		::Dynamic get_connectionState_dyn();
-
-		 ::Dynamic get_localDescription();
-		::Dynamic get_localDescription_dyn();
-
-		::Dynamic setLocalDescription(cpp::Struct<  rtc::Description::Type > sdpType);
-		::Dynamic setLocalDescription_dyn();
-
-		::Dynamic setRemoteDescription( ::Dynamic description);
-		::Dynamic setRemoteDescription_dyn();
-
-		::Dynamic addIceCandidate( ::Dynamic candidate);
-		::Dynamic addIceCandidate_dyn();
-
-		void addPendingTracks();
-		::Dynamic addPendingTracks_dyn();
-
-		void addTrack( ::snikket::jingle::MediaStreamTrack track, ::snikket::jingle::MediaStream stream);
-		::Dynamic addTrack_dyn();
-
-		::Array< ::Dynamic> getTransceivers();
-		::Dynamic getTransceivers_dyn();
-
-		void close();
-		::Dynamic close_dyn();
-
-		void addEventListener(::String event, ::Dynamic callback);
-		::Dynamic addEventListener_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_PeerConnection */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/Session.h b/Sources/c_snikket/iinclude/include/snikket/jingle/Session.h
deleted file mode 100644
index 306298c..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/Session.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_Session
-#define INCLUDED_snikket_jingle_Session
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,DTMFSender)
-HX_DECLARE_CLASS2(snikket,jingle,InitiatedSession)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStream)
-HX_DECLARE_CLASS2(snikket,jingle,MediaStreamTrack)
-HX_DECLARE_CLASS2(snikket,jingle,Session)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES Session_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		::String (::hx::Object :: *_hx_get_sid)(); 
-		static inline ::String get_sid( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_get_sid)();
-		}
-		 ::snikket::jingle::InitiatedSession (::hx::Object :: *_hx_initiate)( ::snikket::Stanza stanza); 
-		static inline  ::snikket::jingle::InitiatedSession initiate( ::Dynamic _hx_, ::snikket::Stanza stanza) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_initiate)(stanza);
-		}
-		void (::hx::Object :: *_hx_accept)(); 
-		static inline void accept( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_accept)();
-		}
-		void (::hx::Object :: *_hx_hangup)(); 
-		static inline void hangup( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_hangup)();
-		}
-		void (::hx::Object :: *_hx_retract)(); 
-		static inline void retract( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_retract)();
-		}
-		void (::hx::Object :: *_hx_terminate)(); 
-		static inline void terminate( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_terminate)();
-		}
-		void (::hx::Object :: *_hx_contentAdd)( ::snikket::Stanza stanza); 
-		static inline void contentAdd( ::Dynamic _hx_, ::snikket::Stanza stanza) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_contentAdd)(stanza);
-		}
-		void (::hx::Object :: *_hx_contentAccept)( ::snikket::Stanza stanza); 
-		static inline void contentAccept( ::Dynamic _hx_, ::snikket::Stanza stanza) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_contentAccept)(stanza);
-		}
-		::Dynamic (::hx::Object :: *_hx_transportInfo)( ::snikket::Stanza stanza); 
-		static inline ::Dynamic transportInfo( ::Dynamic _hx_, ::snikket::Stanza stanza) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_transportInfo)(stanza);
-		}
-		void (::hx::Object :: *_hx_addMedia)(::Array< ::Dynamic> streams); 
-		static inline void addMedia( ::Dynamic _hx_,::Array< ::Dynamic> streams) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_addMedia)(streams);
-		}
-		::String (::hx::Object :: *_hx_callStatus)(); 
-		static inline ::String callStatus( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_callStatus)();
-		}
-		::Array< ::Dynamic> (::hx::Object :: *_hx_videoTracks)(); 
-		static inline ::Array< ::Dynamic> videoTracks( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_videoTracks)();
-		}
-		 ::snikket::jingle::DTMFSender (::hx::Object :: *_hx_dtmf)(); 
-		static inline  ::snikket::jingle::DTMFSender dtmf( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_dtmf)();
-		}
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_Session */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/SessionDescription.h b/Sources/c_snikket/iinclude/include/snikket/jingle/SessionDescription.h
deleted file mode 100644
index 4529362..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/SessionDescription.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_SessionDescription
-#define INCLUDED_snikket_jingle_SessionDescription
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,Attribute)
-HX_DECLARE_CLASS2(snikket,jingle,Media)
-HX_DECLARE_CLASS2(snikket,jingle,SessionDescription)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES SessionDescription_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SessionDescription_obj OBJ_;
-		SessionDescription_obj();
-
-	public:
-		enum { _hx_ClassId = 0x24aad8f0 };
-
-		void __construct(int version,::String name,::Array< ::Dynamic> media,::Array< ::Dynamic> attributes,::Array< ::String > identificationTags);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.SessionDescription")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.SessionDescription"); }
-		static ::hx::ObjectPtr< SessionDescription_obj > __new(int version,::String name,::Array< ::Dynamic> media,::Array< ::Dynamic> attributes,::Array< ::String > identificationTags);
-		static ::hx::ObjectPtr< SessionDescription_obj > __alloc(::hx::Ctx *_hx_ctx,int version,::String name,::Array< ::Dynamic> media,::Array< ::Dynamic> attributes,::Array< ::String > identificationTags);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SessionDescription_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SessionDescription",66,e1,61,a3); }
-
-		static  ::snikket::jingle::SessionDescription parse(::String input);
-		static ::Dynamic parse_dyn();
-
-		static  ::snikket::jingle::SessionDescription fromStanza( ::snikket::Stanza iq,bool initiator, ::snikket::jingle::SessionDescription existingDescription);
-		static ::Dynamic fromStanza_dyn();
-
-		int version;
-		::String name;
-		::Array< ::Dynamic> media;
-		::Array< ::Dynamic> attributes;
-		::Array< ::String > identificationTags;
-		 ::Dynamic getUfragPwd();
-		::Dynamic getUfragPwd_dyn();
-
-		 ::snikket::jingle::Attribute getFingerprint();
-		::Dynamic getFingerprint_dyn();
-
-		::String getDtlsSetup();
-		::Dynamic getDtlsSetup_dyn();
-
-		 ::snikket::jingle::SessionDescription addContent( ::snikket::jingle::SessionDescription newDescription);
-		::Dynamic addContent_dyn();
-
-		::String toSdp();
-		::Dynamic toSdp_dyn();
-
-		 ::snikket::Stanza toStanza(::String action,::String sid,bool initiator);
-		::Dynamic toStanza_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_SessionDescription */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/TransportInfo.h b/Sources/c_snikket/iinclude/include/snikket/jingle/TransportInfo.h
deleted file mode 100644
index 1af9d00..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/TransportInfo.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle_TransportInfo
-#define INCLUDED_snikket_jingle_TransportInfo
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,jingle,Media)
-HX_DECLARE_CLASS2(snikket,jingle,TransportInfo)
-
-namespace snikket{
-namespace jingle{
-
-
-class HXCPP_CLASS_ATTRIBUTES TransportInfo_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef TransportInfo_obj OBJ_;
-		TransportInfo_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4c85e215 };
-
-		void __construct( ::snikket::jingle::Media media,::String sid);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.jingle.TransportInfo")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.jingle.TransportInfo"); }
-		static ::hx::ObjectPtr< TransportInfo_obj > __new( ::snikket::jingle::Media media,::String sid);
-		static ::hx::ObjectPtr< TransportInfo_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::jingle::Media media,::String sid);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~TransportInfo_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("TransportInfo",97,8c,bf,fe); }
-
-		 ::snikket::jingle::Media media;
-		::String sid;
-		 ::snikket::Stanza toStanza(bool initiator);
-		::Dynamic toStanza_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-
-#endif /* INCLUDED_snikket_jingle_TransportInfo */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/jingle/_Session/Session_Fields_.h b/Sources/c_snikket/iinclude/include/snikket/jingle/_Session/Session_Fields_.h
deleted file mode 100644
index 5690ec1..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/jingle/_Session/Session_Fields_.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_jingle__Session_Session_Fields_
-#define INCLUDED_snikket_jingle__Session_Session_Fields_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS3(snikket,jingle,_Session,Session_Fields_)
-
-namespace snikket{
-namespace jingle{
-namespace _Session{
-
-
-class HXCPP_CLASS_ATTRIBUTES Session_Fields__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Session_Fields__obj OBJ_;
-		Session_Fields__obj();
-
-	public:
-		enum { _hx_ClassId = 0x4b7e6858 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.jingle._Session.Session_Fields_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.jingle._Session.Session_Fields_"); }
-
-		inline static ::hx::ObjectPtr< Session_Fields__obj > __new() {
-			::hx::ObjectPtr< Session_Fields__obj > __this = new Session_Fields__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Session_Fields__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Session_Fields__obj *__this = (Session_Fields__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Session_Fields__obj), false, "snikket.jingle._Session.Session_Fields_"));
-			*(void **)__this = Session_Fields__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Session_Fields__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Session_Fields_",5d,02,e4,dc); }
-
-		static  ::snikket::ChatMessage mkCallMessage( ::snikket::JID to, ::snikket::JID from, ::snikket::Stanza event);
-		static ::Dynamic mkCallMessage_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace jingle
-} // end namespace _Session
-
-#endif /* INCLUDED_snikket_jingle__Session_Session_Fields_ */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/persistence/Dummy.h b/Sources/c_snikket/iinclude/include/snikket/persistence/Dummy.h
deleted file mode 100644
index 6b7e275..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/persistence/Dummy.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_persistence_Dummy
-#define INCLUDED_snikket_persistence_Dummy
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_Persistence
-#include <snikket/Persistence.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,ReactionUpdate)
-HX_DECLARE_CLASS1(snikket,SerializedChat)
-HX_DECLARE_CLASS2(snikket,persistence,Dummy)
-
-namespace snikket{
-namespace persistence{
-
-
-class HXCPP_CLASS_ATTRIBUTES Dummy_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Dummy_obj OBJ_;
-		Dummy_obj();
-
-	public:
-		enum { _hx_ClassId = 0x130a03e2 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="snikket.persistence.Dummy")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"snikket.persistence.Dummy"); }
-		static ::hx::ObjectPtr< Dummy_obj > __new();
-		static ::hx::ObjectPtr< Dummy_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Dummy_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("Dummy",08,7e,e8,74); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		void lastId(::String accountId,::String chatId, ::Dynamic callback);
-		::Dynamic lastId_dyn();
-
-		void storeChats(::String accountId,::Array< ::Dynamic> chat);
-		::Dynamic storeChats_dyn();
-
-		void getChats(::String accountId, ::Dynamic callback);
-		::Dynamic getChats_dyn();
-
-		void storeMessages(::String accountId,::Array< ::Dynamic> messages, ::Dynamic callback);
-		::Dynamic storeMessages_dyn();
-
-		void updateMessage(::String accountId, ::snikket::ChatMessage message);
-		::Dynamic updateMessage_dyn();
-
-		void getMessage(::String accountId,::String chatId,::String serverId,::String localId, ::Dynamic callback);
-		::Dynamic getMessage_dyn();
-
-		void getMessagesBefore(::String accountId,::String chatId,::String beforeId,::String beforeTime, ::Dynamic callback);
-		::Dynamic getMessagesBefore_dyn();
-
-		void getMessagesAfter(::String accountId,::String chatId,::String afterId,::String afterTime, ::Dynamic callback);
-		::Dynamic getMessagesAfter_dyn();
-
-		void getMessagesAround(::String accountId,::String chatId,::String aroundId,::String aroundTime, ::Dynamic callback);
-		::Dynamic getMessagesAround_dyn();
-
-		void getChatsUnreadDetails(::String accountId,::Array< ::Dynamic> chats, ::Dynamic callback);
-		::Dynamic getChatsUnreadDetails_dyn();
-
-		void storeReaction(::String accountId, ::snikket::ReactionUpdate update, ::Dynamic callback);
-		::Dynamic storeReaction_dyn();
-
-		void updateMessageStatus(::String accountId,::String localId,int status, ::Dynamic callback);
-		::Dynamic updateMessageStatus_dyn();
-
-		void getMediaUri(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback);
-		::Dynamic getMediaUri_dyn();
-
-		void hasMedia(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback);
-		::Dynamic hasMedia_dyn();
-
-		void storeMedia(::String mime,::Array< unsigned char > bd, ::Dynamic callback);
-		::Dynamic storeMedia_dyn();
-
-		void removeMedia(::String hashAlgorithm,::Array< unsigned char > hash);
-		::Dynamic removeMedia_dyn();
-
-		void storeCaps( ::snikket::Caps caps);
-		::Dynamic storeCaps_dyn();
-
-		void getCaps(::String ver, ::Dynamic callback);
-		::Dynamic getCaps_dyn();
-
-		void storeLogin(::String login,::String clientId,::String displayName,::String token);
-		::Dynamic storeLogin_dyn();
-
-		void getLogin(::String login, ::Dynamic callback);
-		::Dynamic getLogin_dyn();
-
-		void removeAccount(::String accountId,bool completely);
-		::Dynamic removeAccount_dyn();
-
-		void listAccounts( ::Dynamic callback);
-		::Dynamic listAccounts_dyn();
-
-		void storeStreamManagement(::String accountId,::Array< unsigned char > sm);
-		::Dynamic storeStreamManagement_dyn();
-
-		void getStreamManagement(::String accountId, ::Dynamic callback);
-		::Dynamic getStreamManagement_dyn();
-
-		void storeService(::String accountId,::String serviceId,::String name,::String node, ::snikket::Caps caps);
-		::Dynamic storeService_dyn();
-
-		void findServicesWithFeature(::String accountId,::String feature, ::Dynamic callback);
-		::Dynamic findServicesWithFeature_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace persistence
-
-#endif /* INCLUDED_snikket_persistence_Dummy */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/persistence/KeyValueStore.h b/Sources/c_snikket/iinclude/include/snikket/persistence/KeyValueStore.h
deleted file mode 100644
index 33fa468..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/persistence/KeyValueStore.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_persistence_KeyValueStore
-#define INCLUDED_snikket_persistence_KeyValueStore
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(snikket,persistence,KeyValueStore)
-
-namespace snikket{
-namespace persistence{
-
-
-class HXCPP_CLASS_ATTRIBUTES KeyValueStore_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		void (::hx::Object :: *_hx_get)(::String k, ::Dynamic callback); 
-		static inline void get( ::Dynamic _hx_,::String k, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::persistence::KeyValueStore_obj *>(_hx_.mPtr->_hx_getInterface(0x42160a8d)))->_hx_get)(k,callback);
-		}
-		void (::hx::Object :: *_hx_set)(::String k,::String v, ::Dynamic callback); 
-		static inline void set( ::Dynamic _hx_,::String k,::String v, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::persistence::KeyValueStore_obj *>(_hx_.mPtr->_hx_getInterface(0x42160a8d)))->_hx_set)(k,v,callback);
-		}
-};
-
-} // end namespace snikket
-} // end namespace persistence
-
-#endif /* INCLUDED_snikket_persistence_KeyValueStore */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/persistence/MediaStore.h b/Sources/c_snikket/iinclude/include/snikket/persistence/MediaStore.h
deleted file mode 100644
index 911ceff..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/persistence/MediaStore.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_persistence_MediaStore
-#define INCLUDED_snikket_persistence_MediaStore
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(snikket,persistence,KeyValueStore)
-HX_DECLARE_CLASS2(snikket,persistence,MediaStore)
-
-namespace snikket{
-namespace persistence{
-
-
-class HXCPP_CLASS_ATTRIBUTES MediaStore_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		void (::hx::Object :: *_hx_hasMedia)(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback); 
-		static inline void hasMedia( ::Dynamic _hx_,::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::persistence::MediaStore_obj *>(_hx_.mPtr->_hx_getInterface(0x2952283f)))->_hx_hasMedia)(hashAlgorithm,hash,callback);
-		}
-		void (::hx::Object :: *_hx_removeMedia)(::String hashAlgorithm,::Array< unsigned char > hash); 
-		static inline void removeMedia( ::Dynamic _hx_,::String hashAlgorithm,::Array< unsigned char > hash) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::persistence::MediaStore_obj *>(_hx_.mPtr->_hx_getInterface(0x2952283f)))->_hx_removeMedia)(hashAlgorithm,hash);
-		}
-		void (::hx::Object :: *_hx_storeMedia)(::String mime,::Array< unsigned char > bytes, ::Dynamic callback); 
-		static inline void storeMedia( ::Dynamic _hx_,::String mime,::Array< unsigned char > bytes, ::Dynamic callback) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::persistence::MediaStore_obj *>(_hx_.mPtr->_hx_getInterface(0x2952283f)))->_hx_storeMedia)(mime,bytes,callback);
-		}
-		void (::hx::Object :: *_hx_setKV)(::Dynamic kv); 
-		static inline void setKV( ::Dynamic _hx_,::Dynamic kv) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::snikket::persistence::MediaStore_obj *>(_hx_.mPtr->_hx_getInterface(0x2952283f)))->_hx_setKV)(kv);
-		}
-};
-
-} // end namespace snikket
-} // end namespace persistence
-
-#endif /* INCLUDED_snikket_persistence_MediaStore */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/persistence/MediaStoreFS.h b/Sources/c_snikket/iinclude/include/snikket/persistence/MediaStoreFS.h
deleted file mode 100644
index 7ceaaa8..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/persistence/MediaStoreFS.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_persistence_MediaStoreFS
-#define INCLUDED_snikket_persistence_MediaStoreFS
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_persistence_MediaStore
-#include <snikket/persistence/MediaStore.h>
-#endif
-HX_DECLARE_CLASS2(snikket,persistence,KeyValueStore)
-HX_DECLARE_CLASS2(snikket,persistence,MediaStore)
-HX_DECLARE_CLASS2(snikket,persistence,MediaStoreFS)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace persistence{
-
-
-class HXCPP_CLASS_ATTRIBUTES MediaStoreFS_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MediaStoreFS_obj OBJ_;
-		MediaStoreFS_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3993cd38 };
-
-		void __construct(::String path);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.persistence.MediaStoreFS")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.persistence.MediaStoreFS"); }
-		static ::hx::ObjectPtr< MediaStoreFS_obj > __new(::String path);
-		static ::hx::ObjectPtr< MediaStoreFS_obj > __alloc(::hx::Ctx *_hx_ctx,::String path);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MediaStoreFS_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("MediaStoreFS",0a,5f,89,fe); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		::String blobpath;
-		::Dynamic kv;
-		void setKV(::Dynamic kv);
-		::Dynamic setKV_dyn();
-
-		void getMediaPath(::String uri, ::Dynamic callback);
-		::Dynamic getMediaPath_dyn();
-
-		void getMediaPath__fromC(::String uri,::cpp::Function< void  (const char*,void*) > callback,void* callback__context);
-
-		void hasMedia(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback);
-		::Dynamic hasMedia_dyn();
-
-		void removeMedia(::String hashAlgorithm,::Array< unsigned char > hash);
-		::Dynamic removeMedia_dyn();
-
-		void storeMedia(::String mime,::Array< unsigned char > bd, ::Dynamic callback);
-		::Dynamic storeMedia_dyn();
-
-		::Dynamic set(::String k,::String v);
-		::Dynamic set_dyn();
-
-		::Dynamic get(::String k);
-		::Dynamic get_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace persistence
-
-#endif /* INCLUDED_snikket_persistence_MediaStoreFS */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/persistence/Sqlite.h b/Sources/c_snikket/iinclude/include/snikket/persistence/Sqlite.h
deleted file mode 100644
index 8418150..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/persistence/Sqlite.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_persistence_Sqlite
-#define INCLUDED_snikket_persistence_Sqlite
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_persistence_KeyValueStore
-#include <snikket/persistence/KeyValueStore.h>
-#endif
-#ifndef INCLUDED_snikket_Persistence
-#include <snikket/Persistence.h>
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS1(haxe,Timer)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Chat)
-HX_DECLARE_CLASS1(snikket,ChatMessage)
-HX_DECLARE_CLASS1(snikket,Persistence)
-HX_DECLARE_CLASS1(snikket,ReactionUpdate)
-HX_DECLARE_CLASS1(snikket,SerializedChat)
-HX_DECLARE_CLASS2(snikket,persistence,KeyValueStore)
-HX_DECLARE_CLASS2(snikket,persistence,MediaStore)
-HX_DECLARE_CLASS2(snikket,persistence,Sqlite)
-HX_DECLARE_CLASS2(snikket,persistence,SqliteDriver)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace persistence{
-
-
-class HXCPP_CLASS_ATTRIBUTES Sqlite_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Sqlite_obj OBJ_;
-		Sqlite_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1fc6c66e };
-
-		void __construct(::String dbfile,::Dynamic media);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.persistence.Sqlite")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.persistence.Sqlite"); }
-		static ::hx::ObjectPtr< Sqlite_obj > __new(::String dbfile,::Dynamic media);
-		static ::hx::ObjectPtr< Sqlite_obj > __alloc(::hx::Ctx *_hx_ctx,::String dbfile,::Dynamic media);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Sqlite_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("Sqlite",ec,9c,99,87); }
-
-		static void __boot();
-		static  ::Dynamic __meta__;
-		 ::snikket::persistence::SqliteDriver db;
-		::Dynamic media;
-		void get(::String k, ::Dynamic callback);
-		::Dynamic get_dyn();
-
-		void set(::String k,::String v, ::Dynamic callback);
-		::Dynamic set_dyn();
-
-		void lastId(::String accountId,::String chatId, ::Dynamic callback);
-		::Dynamic lastId_dyn();
-
-		 ::haxe::ds::StringMap storeChatBuffer;
-		 ::haxe::Timer storeChatTimer;
-		void storeChats(::String accountId,::Array< ::Dynamic> chats);
-		::Dynamic storeChats_dyn();
-
-		void getChats(::String accountId, ::Dynamic callback);
-		::Dynamic getChats_dyn();
-
-		void storeMessages(::String accountId,::Array< ::Dynamic> messages, ::Dynamic callback);
-		::Dynamic storeMessages_dyn();
-
-		void updateMessage(::String accountId, ::snikket::ChatMessage message);
-		::Dynamic updateMessage_dyn();
-
-		void getMessage(::String accountId,::String chatId,::String serverId,::String localId, ::Dynamic callback);
-		::Dynamic getMessage_dyn();
-
-		void getMessage__fromC(::String accountId,::String chatId,::String serverId,::String localId,::cpp::Function< void  (void*,void*) > callback,void* callback__context);
-
-		::Dynamic getMessages(::String accountId,::String chatId,::String time,::String op);
-		::Dynamic getMessages_dyn();
-
-		void getMessagesBefore(::String accountId,::String chatId,::String beforeId,::String beforeTime, ::Dynamic callback);
-		::Dynamic getMessagesBefore_dyn();
-
-		void getMessagesAfter(::String accountId,::String chatId,::String afterId,::String afterTime, ::Dynamic callback);
-		::Dynamic getMessagesAfter_dyn();
-
-		void getMessagesAround(::String accountId,::String chatId,::String aroundId,::String aroundTime, ::Dynamic callback);
-		::Dynamic getMessagesAround_dyn();
-
-		void getChatsUnreadDetails(::String accountId,::Array< ::Dynamic> chats, ::Dynamic callback);
-		::Dynamic getChatsUnreadDetails_dyn();
-
-		void storeReaction(::String accountId, ::snikket::ReactionUpdate update, ::Dynamic callback);
-		::Dynamic storeReaction_dyn();
-
-		void updateMessageStatus(::String accountId,::String localId,int status, ::Dynamic callback);
-		::Dynamic updateMessageStatus_dyn();
-
-		void hasMedia(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback);
-		::Dynamic hasMedia_dyn();
-
-		void removeMedia(::String hashAlgorithm,::Array< unsigned char > hash);
-		::Dynamic removeMedia_dyn();
-
-		void storeMedia(::String mime,::Array< unsigned char > bd, ::Dynamic callback);
-		::Dynamic storeMedia_dyn();
-
-		void storeCaps( ::snikket::Caps caps);
-		::Dynamic storeCaps_dyn();
-
-		void getCaps(::String ver, ::Dynamic callback);
-		::Dynamic getCaps_dyn();
-
-		void storeLogin(::String accountId,::String clientId,::String displayName,::String token);
-		::Dynamic storeLogin_dyn();
-
-		void getLogin(::String accountId, ::Dynamic callback);
-		::Dynamic getLogin_dyn();
-
-		void removeAccount(::String accountId,bool completely);
-		::Dynamic removeAccount_dyn();
-
-		void listAccounts( ::Dynamic callback);
-		::Dynamic listAccounts_dyn();
-
-		void listAccounts__fromC(::cpp::Function< void  (const char**,size_t,void*) > callback,void* callback__context);
-
-		bool smStoreInProgress;
-		::Array< unsigned char > smStoreNext;
-		void storeStreamManagement(::String accountId,::Array< unsigned char > sm);
-		::Dynamic storeStreamManagement_dyn();
-
-		void getStreamManagement(::String accountId, ::Dynamic callback);
-		::Dynamic getStreamManagement_dyn();
-
-		void storeService(::String accountId,::String serviceId,::String name,::String node, ::snikket::Caps caps);
-		::Dynamic storeService_dyn();
-
-		void findServicesWithFeature(::String accountId,::String feature, ::Dynamic callback);
-		::Dynamic findServicesWithFeature_dyn();
-
-		::Dynamic hydrateReactions(::String accountId,::Array< ::Dynamic> messages);
-		::Dynamic hydrateReactions_dyn();
-
-		::Dynamic fetchReactions(::String accountId,::Array< ::Dynamic> ids);
-		::Dynamic fetchReactions_dyn();
-
-		::Dynamic hydrateReplyTo(::String accountId,::Array< ::Dynamic> messages,::Array< ::Dynamic> replyTos);
-		::Dynamic hydrateReplyTo_dyn();
-
-		::Array< ::Dynamic> hydrateMessages(::String accountId, ::Dynamic rows);
-		::Dynamic hydrateMessages_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace persistence
-
-#endif /* INCLUDED_snikket_persistence_Sqlite */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/persistence/SqliteDriver.h b/Sources/c_snikket/iinclude/include/snikket/persistence/SqliteDriver.h
deleted file mode 100644
index d13d4d8..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/persistence/SqliteDriver.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_persistence_SqliteDriver
-#define INCLUDED_snikket_persistence_SqliteDriver
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(snikket,persistence,SqliteDriver)
-HX_DECLARE_CLASS2(sys,db,Connection)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace snikket{
-namespace persistence{
-
-
-class HXCPP_CLASS_ATTRIBUTES SqliteDriver_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SqliteDriver_obj OBJ_;
-		SqliteDriver_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0672539a };
-
-		void __construct(::String dbfile);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.persistence.SqliteDriver")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.persistence.SqliteDriver"); }
-		static ::hx::ObjectPtr< SqliteDriver_obj > __new(::String dbfile);
-		static ::hx::ObjectPtr< SqliteDriver_obj > __alloc(::hx::Ctx *_hx_ctx,::String dbfile);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SqliteDriver_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SqliteDriver",34,0a,34,44); }
-
-		::Dynamic db;
-		::Dynamic exec( ::Dynamic sql,::cpp::VirtualArray params);
-		::Dynamic exec_dyn();
-
-		::String prepare(::String sql,::cpp::VirtualArray params);
-		::Dynamic prepare_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace persistence
-
-#endif /* INCLUDED_snikket_persistence_SqliteDriver */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/BlocklistGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/BlocklistGet.h
deleted file mode 100644
index ab498fe..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/BlocklistGet.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_BlocklistGet
-#define INCLUDED_snikket_queries_BlocklistGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,BlocklistGet)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES BlocklistGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef BlocklistGet_obj OBJ_;
-		BlocklistGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x60103714 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.BlocklistGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.BlocklistGet"); }
-		static ::hx::ObjectPtr< BlocklistGet_obj > __new();
-		static ::hx::ObjectPtr< BlocklistGet_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BlocklistGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("BlocklistGet",4b,75,69,37); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		::Array< ::String > result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		::Array< ::String > getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_BlocklistGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/BoB.h b/Sources/c_snikket/iinclude/include/snikket/queries/BoB.h
deleted file mode 100644
index a2bd8ec..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/BoB.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_BoB
-#define INCLUDED_snikket_queries_BoB
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Hash)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,BoB)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES BoB_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef BoB_obj OBJ_;
-		BoB_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6fef110c };
-
-		void __construct(::String to,::String uri);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.BoB")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.BoB"); }
-		static ::hx::ObjectPtr< BoB_obj > __new(::String to,::String uri);
-		static ::hx::ObjectPtr< BoB_obj > __alloc(::hx::Ctx *_hx_ctx,::String to,::String uri);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BoB_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("BoB",b5,75,32,00); }
-
-		static  ::snikket::queries::BoB forHash(::String to, ::snikket::Hash hash);
-		static ::Dynamic forHash_dyn();
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		 ::Dynamic result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		 ::Dynamic getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_BoB */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/DiscoInfoGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/DiscoInfoGet.h
deleted file mode 100644
index cb69a82..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/DiscoInfoGet.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_DiscoInfoGet
-#define INCLUDED_snikket_queries_DiscoInfoGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Caps)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,DiscoInfoGet)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES DiscoInfoGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef DiscoInfoGet_obj OBJ_;
-		DiscoInfoGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x17bd6e57 };
-
-		void __construct(::String to,::String node);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.DiscoInfoGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.DiscoInfoGet"); }
-		static ::hx::ObjectPtr< DiscoInfoGet_obj > __new(::String to,::String node);
-		static ::hx::ObjectPtr< DiscoInfoGet_obj > __alloc(::hx::Ctx *_hx_ctx,::String to,::String node);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DiscoInfoGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DiscoInfoGet",8e,ac,16,ef); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		 ::snikket::Caps result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		 ::snikket::Caps getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_DiscoInfoGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/DiscoItemsGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/DiscoItemsGet.h
deleted file mode 100644
index 8096b9e..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/DiscoItemsGet.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_DiscoItemsGet
-#define INCLUDED_snikket_queries_DiscoItemsGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,DiscoItemsGet)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES DiscoItemsGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef DiscoItemsGet_obj OBJ_;
-		DiscoItemsGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3759f407 };
-
-		void __construct(::String to,::String node);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.DiscoItemsGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.DiscoItemsGet"); }
-		static ::hx::ObjectPtr< DiscoItemsGet_obj > __new(::String to,::String node);
-		static ::hx::ObjectPtr< DiscoItemsGet_obj > __alloc(::hx::Ctx *_hx_ctx,::String to,::String node);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~DiscoItemsGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("DiscoItemsGet",f0,25,17,ce); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		::Array< ::Dynamic> result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		::Array< ::Dynamic> getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_DiscoItemsGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/ExtDiscoGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/ExtDiscoGet.h
deleted file mode 100644
index 7f2afdc..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/ExtDiscoGet.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_ExtDiscoGet
-#define INCLUDED_snikket_queries_ExtDiscoGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,ExtDiscoGet)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES ExtDiscoGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef ExtDiscoGet_obj OBJ_;
-		ExtDiscoGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5f97d134 };
-
-		void __construct(::String to);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.ExtDiscoGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.ExtDiscoGet"); }
-		static ::hx::ObjectPtr< ExtDiscoGet_obj > __new(::String to);
-		static ::hx::ObjectPtr< ExtDiscoGet_obj > __alloc(::hx::Ctx *_hx_ctx,::String to);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ExtDiscoGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ExtDiscoGet",dd,86,3d,f9); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		::Array< ::Dynamic> result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		::Array< ::Dynamic> getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_ExtDiscoGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/GenericQuery.h b/Sources/c_snikket/iinclude/include/snikket/queries/GenericQuery.h
deleted file mode 100644
index b2b72e1..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/GenericQuery.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#define INCLUDED_snikket_queries_GenericQuery
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES GenericQuery_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef GenericQuery_obj OBJ_;
-		GenericQuery_obj();
-
-	public:
-		enum { _hx_ClassId = 0x22eda35a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.GenericQuery")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.GenericQuery"); }
-
-		//~GenericQuery_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("GenericQuery",91,e1,46,fa); }
-
-		 ::snikket::Stanza queryStanza;
-		 ::Dynamic handleFinished;
-		Dynamic handleFinished_dyn() { return handleFinished;}
-		bool isFinished;
-		 ::snikket::Stanza getQueryStanza();
-		::Dynamic getQueryStanza_dyn();
-
-		void finish();
-		::Dynamic finish_dyn();
-
-		virtual void handleResponse( ::snikket::Stanza response) {}
-		::Dynamic handleResponse_dyn();
-		void onFinished( ::Dynamic handler);
-		::Dynamic onFinished_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_GenericQuery */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/HttpUploadSlot.h b/Sources/c_snikket/iinclude/include/snikket/queries/HttpUploadSlot.h
deleted file mode 100644
index 883512b..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/HttpUploadSlot.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_HttpUploadSlot
-#define INCLUDED_snikket_queries_HttpUploadSlot
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Hash)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,HttpUploadSlot)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES HttpUploadSlot_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef HttpUploadSlot_obj OBJ_;
-		HttpUploadSlot_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1883dc70 };
-
-		void __construct(::String to,::String filename,int size,::String mime,::Array< ::Dynamic> hashes);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.HttpUploadSlot")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.HttpUploadSlot"); }
-		static ::hx::ObjectPtr< HttpUploadSlot_obj > __new(::String to,::String filename,int size,::String mime,::Array< ::Dynamic> hashes);
-		static ::hx::ObjectPtr< HttpUploadSlot_obj > __alloc(::hx::Ctx *_hx_ctx,::String to,::String filename,int size,::String mime,::Array< ::Dynamic> hashes);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HttpUploadSlot_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HttpUploadSlot",67,56,52,67); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		 ::Dynamic result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		 ::Dynamic getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_HttpUploadSlot */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/JabberIqGatewayGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/JabberIqGatewayGet.h
deleted file mode 100644
index 9c76c99..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/JabberIqGatewayGet.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_JabberIqGatewayGet
-#define INCLUDED_snikket_queries_JabberIqGatewayGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS2(haxe,ds,Either)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,JabberIqGatewayGet)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES JabberIqGatewayGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef JabberIqGatewayGet_obj OBJ_;
-		JabberIqGatewayGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3942ef8b };
-
-		void __construct(::String to,::String prompt);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.JabberIqGatewayGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.JabberIqGatewayGet"); }
-		static ::hx::ObjectPtr< JabberIqGatewayGet_obj > __new(::String to,::String prompt);
-		static ::hx::ObjectPtr< JabberIqGatewayGet_obj > __alloc(::hx::Ctx *_hx_ctx,::String to,::String prompt);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~JabberIqGatewayGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("JabberIqGatewayGet",9e,bd,60,0b); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		 ::haxe::ds::Either result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		 ::haxe::ds::Either getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_JabberIqGatewayGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/MAMQuery.h b/Sources/c_snikket/iinclude/include/snikket/queries/MAMQuery.h
deleted file mode 100644
index c3abe95..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/MAMQuery.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_MAMQuery
-#define INCLUDED_snikket_queries_MAMQuery
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,MAMQuery)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES MAMQuery_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef MAMQuery_obj OBJ_;
-		MAMQuery_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3d2643e0 };
-
-		void __construct( ::Dynamic params,::String jid);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.MAMQuery")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.MAMQuery"); }
-		static ::hx::ObjectPtr< MAMQuery_obj > __new( ::Dynamic params,::String jid);
-		static ::hx::ObjectPtr< MAMQuery_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic params,::String jid);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MAMQuery_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MAMQuery",cf,3d,b2,7d); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		 ::Dynamic result;
-		void addStringField(::String name,::String value);
-		::Dynamic addStringField_dyn();
-
-		void addArrayField(::String name,::Array< ::String > values);
-		::Dynamic addArrayField_dyn();
-
-		void handleResponse( ::snikket::Stanza stanza);
-
-		 ::Dynamic getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_MAMQuery */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/PubsubGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/PubsubGet.h
deleted file mode 100644
index 0765cc8..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/PubsubGet.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_PubsubGet
-#define INCLUDED_snikket_queries_PubsubGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,PubsubGet)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES PubsubGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef PubsubGet_obj OBJ_;
-		PubsubGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1a0e23ea };
-
-		void __construct(::String to,::String node,::String itemId);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.PubsubGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.PubsubGet"); }
-		static ::hx::ObjectPtr< PubsubGet_obj > __new(::String to,::String node,::String itemId);
-		static ::hx::ObjectPtr< PubsubGet_obj > __alloc(::hx::Ctx *_hx_ctx,::String to,::String node,::String itemId);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~PubsubGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("PubsubGet",53,ed,9f,94); }
-
-		::String xmlns;
-		::String queryId;
-		::String ver;
-		 ::snikket::Stanza responseStanza;
-		::Array< ::Dynamic> result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		::Array< ::Dynamic> getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_PubsubGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/Push2Disable.h b/Sources/c_snikket/iinclude/include/snikket/queries/Push2Disable.h
deleted file mode 100644
index 19efee6..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/Push2Disable.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_Push2Disable
-#define INCLUDED_snikket_queries_Push2Disable
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,Push2Disable)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES Push2Disable_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef Push2Disable_obj OBJ_;
-		Push2Disable_obj();
-
-	public:
-		enum { _hx_ClassId = 0x582a6599 };
-
-		void __construct(::String to);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.Push2Disable")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.Push2Disable"); }
-		static ::hx::ObjectPtr< Push2Disable_obj > __new(::String to);
-		static ::hx::ObjectPtr< Push2Disable_obj > __alloc(::hx::Ctx *_hx_ctx,::String to);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Push2Disable_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Push2Disable",d0,a3,83,2f); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		void handleResponse( ::snikket::Stanza stanza);
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_Push2Disable */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/RosterGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/RosterGet.h
deleted file mode 100644
index befa38a..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/RosterGet.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_RosterGet
-#define INCLUDED_snikket_queries_RosterGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,RosterGet)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES RosterGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef RosterGet_obj OBJ_;
-		RosterGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6634aa42 };
-
-		void __construct(::String ver);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.RosterGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.RosterGet"); }
-		static ::hx::ObjectPtr< RosterGet_obj > __new(::String ver);
-		static ::hx::ObjectPtr< RosterGet_obj > __alloc(::hx::Ctx *_hx_ctx,::String ver);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~RosterGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("RosterGet",ab,73,c6,e0); }
-
-		::String xmlns;
-		::String queryId;
-		::String ver;
-		 ::snikket::Stanza responseStanza;
-		::Array< ::Dynamic> result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		::Array< ::Dynamic> getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_RosterGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/queries/VcardTempGet.h b/Sources/c_snikket/iinclude/include/snikket/queries/VcardTempGet.h
deleted file mode 100644
index fea8f62..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/queries/VcardTempGet.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_queries_VcardTempGet
-#define INCLUDED_snikket_queries_VcardTempGet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_queries_GenericQuery
-#include <snikket/queries/GenericQuery.h>
-#endif
-HX_DECLARE_CLASS1(snikket,JID)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,queries,GenericQuery)
-HX_DECLARE_CLASS2(snikket,queries,VcardTempGet)
-
-namespace snikket{
-namespace queries{
-
-
-class HXCPP_CLASS_ATTRIBUTES VcardTempGet_obj : public  ::snikket::queries::GenericQuery_obj
-{
-	public:
-		typedef  ::snikket::queries::GenericQuery_obj super;
-		typedef VcardTempGet_obj OBJ_;
-		VcardTempGet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4c679325 };
-
-		void __construct( ::snikket::JID to);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.queries.VcardTempGet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.queries.VcardTempGet"); }
-		static ::hx::ObjectPtr< VcardTempGet_obj > __new( ::snikket::JID to);
-		static ::hx::ObjectPtr< VcardTempGet_obj > __alloc(::hx::Ctx *_hx_ctx, ::snikket::JID to);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~VcardTempGet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("VcardTempGet",5c,d1,c0,23); }
-
-		::String xmlns;
-		::String queryId;
-		 ::snikket::Stanza responseStanza;
-		 ::Dynamic result;
-		void handleResponse( ::snikket::Stanza stanza);
-
-		 ::Dynamic getResult();
-		::Dynamic getResult_dyn();
-
-};
-
-} // end namespace snikket
-} // end namespace queries
-
-#endif /* INCLUDED_snikket_queries_VcardTempGet */ 
diff --git a/Sources/c_snikket/iinclude/include/snikket/streams/XmppStropheStream.h b/Sources/c_snikket/iinclude/include/snikket/streams/XmppStropheStream.h
deleted file mode 100644
index 59b34d0..0000000
--- a/Sources/c_snikket/iinclude/include/snikket/streams/XmppStropheStream.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_snikket_streams_XmppStropheStream
-#define INCLUDED_snikket_streams_XmppStropheStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_snikket_GenericStream
-#include <snikket/GenericStream.h>
-#endif
-#ifndef INCLUDED_18a1146676e1af0b
-#define INCLUDED_18a1146676e1af0b
-#include "strophe.h"
-#endif
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,BalancedTree)
-HX_DECLARE_CLASS2(haxe,ds,EnumValueMap)
-HX_DECLARE_CLASS1(snikket,EventEmitter)
-HX_DECLARE_CLASS1(snikket,GenericStream)
-HX_DECLARE_CLASS1(snikket,IqRequestType)
-HX_DECLARE_CLASS1(snikket,IqResult)
-HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
-HX_DECLARE_CLASS2(snikket,streams,XmppStropheStream)
-
-#include "strophe.h"
-namespace snikket{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES XmppStropheStream_obj : public  ::snikket::GenericStream_obj
-{
-	public:
-		typedef  ::snikket::GenericStream_obj super;
-		typedef XmppStropheStream_obj OBJ_;
-		XmppStropheStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7e6ea620 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.streams.XmppStropheStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.streams.XmppStropheStream"); }
-		static ::hx::ObjectPtr< XmppStropheStream_obj > __new();
-		static ::hx::ObjectPtr< XmppStropheStream_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~XmppStropheStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("XmppStropheStream",da,d9,8d,8c); }
-
-		static int strophe_certfail_handler( const xmpp_tlscert_t* cert,const char* err);
-
-		static int strophe_stanza( xmpp_conn_t* conn, xmpp_stanza_t* sstanza,void* userdata);
-
-		static void strophe_connect( xmpp_conn_t* conn, xmpp_conn_event_t event,int error, xmpp_stream_error_t* stream_error,void* userdata);
-
-		static  ::snikket::Stanza convertToStanza( xmpp_stanza_t* el,void* dummy);
-
-		 ::haxe::ds::EnumValueMap iqHandlers;
-		::Array< ::Dynamic> pending;
-		bool ready;
-		::String newId();
-
-		void onIq( ::snikket::IqRequestType type,::String tag,::String xmlns, ::Dynamic handler);
-
-		void connect(::String jid,::Array< unsigned char > sm);
-
-		void disconnect();
-
-		void poll();
-		::Dynamic poll_dyn();
-
-		 xmpp_stanza_t* convertFromStanza( ::snikket::Stanza el);
-		::Dynamic convertFromStanza_dyn();
-
-		void sendStanza( ::snikket::Stanza stanza);
-
-		void finalize();
-		::Dynamic finalize_dyn();
-
-
-	private: xmpp_ctx_t *ctx;
-	private: xmpp_conn_t *conn;
-
-};
-
-} // end namespace snikket
-} // end namespace streams
-
-#endif /* INCLUDED_snikket_streams_XmppStropheStream */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/FileSystem.h b/Sources/c_snikket/iinclude/include/sys/FileSystem.h
deleted file mode 100644
index 882325d..0000000
--- a/Sources/c_snikket/iinclude/include/sys/FileSystem.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_FileSystem
-#define INCLUDED_sys_FileSystem
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(sys,FileSystem)
-
-namespace sys{
-
-
-class HXCPP_CLASS_ATTRIBUTES FileSystem_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef FileSystem_obj OBJ_;
-		FileSystem_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2378c654 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="sys.FileSystem")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"sys.FileSystem"); }
-
-		inline static ::hx::ObjectPtr< FileSystem_obj > __new() {
-			::hx::ObjectPtr< FileSystem_obj > __this = new FileSystem_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< FileSystem_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			FileSystem_obj *__this = (FileSystem_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(FileSystem_obj), false, "sys.FileSystem"));
-			*(void **)__this = FileSystem_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FileSystem_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("FileSystem",ab,e2,17,ca); }
-
-		static bool exists(::String path);
-		static ::Dynamic exists_dyn();
-
-		static  ::Dynamic stat(::String path);
-		static ::Dynamic stat_dyn();
-
-		static ::String fullPath(::String relPath);
-		static ::Dynamic fullPath_dyn();
-
-		static ::String absolutePath(::String relPath);
-		static ::Dynamic absolutePath_dyn();
-
-		static bool isDirectory(::String path);
-		static ::Dynamic isDirectory_dyn();
-
-		static void deleteFile(::String path);
-		static ::Dynamic deleteFile_dyn();
-
-};
-
-} // end namespace sys
-
-#endif /* INCLUDED_sys_FileSystem */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/Http.h b/Sources/c_snikket/iinclude/include/sys/Http.h
deleted file mode 100644
index 42e3202..0000000
--- a/Sources/c_snikket/iinclude/include/sys/Http.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_Http
-#define INCLUDED_sys_Http
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_http_HttpBase
-#include <haxe/http/HttpBase.h>
-#endif
-HX_DECLARE_CLASS0(EReg)
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,StringMap)
-HX_DECLARE_CLASS2(haxe,http,HttpBase)
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,BytesOutput)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS1(sys,Http)
-HX_DECLARE_CLASS2(sys,net,Socket)
-
-namespace sys{
-
-
-class HXCPP_CLASS_ATTRIBUTES Http_obj : public  ::haxe::http::HttpBase_obj
-{
-	public:
-		typedef  ::haxe::http::HttpBase_obj super;
-		typedef Http_obj OBJ_;
-		Http_obj();
-
-	public:
-		enum { _hx_ClassId = 0x02924475 };
-
-		void __construct(::String url);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.Http")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.Http"); }
-		static ::hx::ObjectPtr< Http_obj > __new(::String url);
-		static ::hx::ObjectPtr< Http_obj > __alloc(::hx::Ctx *_hx_ctx,::String url);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Http_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Http",a8,c7,ef,2f); }
-
-		static void __boot();
-		static  ::Dynamic PROXY;
-		bool noShutdown;
-		Float cnxTimeout;
-		 ::haxe::ds::StringMap responseHeaders;
-		 ::haxe::ds::StringMap responseHeadersSameKey;
-		 ::Dynamic chunk_size;
-		 ::haxe::io::Bytes chunk_buf;
-		 ::Dynamic file;
-		void request( ::Dynamic post);
-		::Dynamic request_dyn();
-
-		void customRequest(bool post, ::haxe::io::Output api, ::sys::net::Socket sock,::String method);
-		::Dynamic customRequest_dyn();
-
-		void writeBody( ::haxe::io::BytesOutput body, ::haxe::io::Input fileInput,int fileSize,::String boundary, ::sys::net::Socket sock);
-		::Dynamic writeBody_dyn();
-
-		void readHttpResponse( ::haxe::io::Output api, ::sys::net::Socket sock);
-		::Dynamic readHttpResponse_dyn();
-
-		bool readChunk( ::EReg chunk_re, ::haxe::io::Output api, ::haxe::io::Bytes buf,int len);
-		::Dynamic readChunk_dyn();
-
-};
-
-} // end namespace sys
-
-#endif /* INCLUDED_sys_Http */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/db/Connection.h b/Sources/c_snikket/iinclude/include/sys/db/Connection.h
deleted file mode 100644
index cf46b5f..0000000
--- a/Sources/c_snikket/iinclude/include/sys/db/Connection.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_db_Connection
-#define INCLUDED_sys_db_Connection
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sys,db,Connection)
-HX_DECLARE_CLASS2(sys,db,ResultSet)
-
-namespace sys{
-namespace db{
-
-
-class HXCPP_CLASS_ATTRIBUTES Connection_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		::Dynamic (::hx::Object :: *_hx_request)(::String s); 
-		static inline ::Dynamic request( ::Dynamic _hx_,::String s) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::sys::db::Connection_obj *>(_hx_.mPtr->_hx_getInterface(0x6e7a3d49)))->_hx_request)(s);
-		}
-		::String (::hx::Object :: *_hx_quote)(::String s); 
-		static inline ::String quote( ::Dynamic _hx_,::String s) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::sys::db::Connection_obj *>(_hx_.mPtr->_hx_getInterface(0x6e7a3d49)))->_hx_quote)(s);
-		}
-};
-
-} // end namespace sys
-} // end namespace db
-
-#endif /* INCLUDED_sys_db_Connection */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/db/ResultSet.h b/Sources/c_snikket/iinclude/include/sys/db/ResultSet.h
deleted file mode 100644
index 6a8d3ca..0000000
--- a/Sources/c_snikket/iinclude/include/sys/db/ResultSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_db_ResultSet
-#define INCLUDED_sys_db_ResultSet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sys,db,ResultSet)
-
-namespace sys{
-namespace db{
-
-
-class HXCPP_CLASS_ATTRIBUTES ResultSet_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		bool (::hx::Object :: *_hx_hasNext)(); 
-		static inline bool hasNext( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::sys::db::ResultSet_obj *>(_hx_.mPtr->_hx_getInterface(0xc11b83fa)))->_hx_hasNext)();
-		}
-		 ::Dynamic (::hx::Object :: *_hx_next)(); 
-		static inline  ::Dynamic next( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::sys::db::ResultSet_obj *>(_hx_.mPtr->_hx_getInterface(0xc11b83fa)))->_hx_next)();
-		}
-};
-
-} // end namespace sys
-} // end namespace db
-
-#endif /* INCLUDED_sys_db_ResultSet */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/db/Sqlite.h b/Sources/c_snikket/iinclude/include/sys/db/Sqlite.h
deleted file mode 100644
index ae8bcba..0000000
--- a/Sources/c_snikket/iinclude/include/sys/db/Sqlite.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_db_Sqlite
-#define INCLUDED_sys_db_Sqlite
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sys,db,Connection)
-HX_DECLARE_CLASS2(sys,db,Sqlite)
-
-namespace sys{
-namespace db{
-
-
-class HXCPP_CLASS_ATTRIBUTES Sqlite_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Sqlite_obj OBJ_;
-		Sqlite_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1fc648d3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="sys.db.Sqlite")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"sys.db.Sqlite"); }
-
-		inline static ::hx::ObjectPtr< Sqlite_obj > __new() {
-			::hx::ObjectPtr< Sqlite_obj > __this = new Sqlite_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Sqlite_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Sqlite_obj *__this = (Sqlite_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Sqlite_obj), false, "sys.db.Sqlite"));
-			*(void **)__this = Sqlite_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Sqlite_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Sqlite",ec,9c,99,87); }
-
-		static ::Dynamic open(::String file);
-		static ::Dynamic open_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace db
-
-#endif /* INCLUDED_sys_db_Sqlite */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/db/_Sqlite/SqliteConnection.h b/Sources/c_snikket/iinclude/include/sys/db/_Sqlite/SqliteConnection.h
deleted file mode 100644
index 7c154f8..0000000
--- a/Sources/c_snikket/iinclude/include/sys/db/_Sqlite/SqliteConnection.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_db__Sqlite_SqliteConnection
-#define INCLUDED_sys_db__Sqlite_SqliteConnection
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_sys_db_Connection
-#include <sys/db/Connection.h>
-#endif
-HX_DECLARE_CLASS2(sys,db,Connection)
-HX_DECLARE_CLASS2(sys,db,ResultSet)
-HX_DECLARE_CLASS3(sys,db,_Sqlite,SqliteConnection)
-
-namespace sys{
-namespace db{
-namespace _Sqlite{
-
-
-class HXCPP_CLASS_ATTRIBUTES SqliteConnection_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SqliteConnection_obj OBJ_;
-		SqliteConnection_obj();
-
-	public:
-		enum { _hx_ClassId = 0x26edc0ae };
-
-		void __construct(::String file);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.db._Sqlite.SqliteConnection")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.db._Sqlite.SqliteConnection"); }
-		static ::hx::ObjectPtr< SqliteConnection_obj > __new(::String file);
-		static ::hx::ObjectPtr< SqliteConnection_obj > __alloc(::hx::Ctx *_hx_ctx,::String file);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SqliteConnection_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("SqliteConnection",2a,20,03,a3); }
-
-		 ::Dynamic c;
-		::Dynamic request(::String s);
-		::Dynamic request_dyn();
-
-		::String quote(::String s);
-		::Dynamic quote_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace db
-} // end namespace _Sqlite
-
-#endif /* INCLUDED_sys_db__Sqlite_SqliteConnection */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/db/_Sqlite/SqliteResultSet.h b/Sources/c_snikket/iinclude/include/sys/db/_Sqlite/SqliteResultSet.h
deleted file mode 100644
index 3437f67..0000000
--- a/Sources/c_snikket/iinclude/include/sys/db/_Sqlite/SqliteResultSet.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_db__Sqlite_SqliteResultSet
-#define INCLUDED_sys_db__Sqlite_SqliteResultSet
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_sys_db_ResultSet
-#include <sys/db/ResultSet.h>
-#endif
-HX_DECLARE_CLASS2(haxe,ds,List)
-HX_DECLARE_CLASS2(sys,db,ResultSet)
-HX_DECLARE_CLASS3(sys,db,_Sqlite,SqliteResultSet)
-
-namespace sys{
-namespace db{
-namespace _Sqlite{
-
-
-class HXCPP_CLASS_ATTRIBUTES SqliteResultSet_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SqliteResultSet_obj OBJ_;
-		SqliteResultSet_obj();
-
-	public:
-		enum { _hx_ClassId = 0x068aee19 };
-
-		void __construct( ::Dynamic r);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.db._Sqlite.SqliteResultSet")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.db._Sqlite.SqliteResultSet"); }
-		static ::hx::ObjectPtr< SqliteResultSet_obj > __new( ::Dynamic r);
-		static ::hx::ObjectPtr< SqliteResultSet_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic r);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SqliteResultSet_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("SqliteResultSet",39,58,4c,f7); }
-
-		 ::Dynamic r;
-		 ::haxe::ds::List cache;
-		bool hasNext();
-		::Dynamic hasNext_dyn();
-
-		 ::Dynamic next();
-		::Dynamic next_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace db
-} // end namespace _Sqlite
-
-#endif /* INCLUDED_sys_db__Sqlite_SqliteResultSet */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/io/File.h b/Sources/c_snikket/iinclude/include/sys/io/File.h
deleted file mode 100644
index 11172d1..0000000
--- a/Sources/c_snikket/iinclude/include/sys/io/File.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_io_File
-#define INCLUDED_sys_io_File
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS2(sys,io,File)
-HX_DECLARE_CLASS2(sys,io,FileInput)
-HX_DECLARE_CLASS2(sys,io,FileOutput)
-
-namespace sys{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES File_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef File_obj OBJ_;
-		File_obj();
-
-	public:
-		enum { _hx_ClassId = 0x645a6147 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="sys.io.File")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"sys.io.File"); }
-
-		inline static ::hx::ObjectPtr< File_obj > __new() {
-			::hx::ObjectPtr< File_obj > __this = new File_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< File_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			File_obj *__this = (File_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(File_obj), false, "sys.io.File"));
-			*(void **)__this = File_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~File_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("File",9c,fa,94,2e); }
-
-		static void saveBytes(::String path, ::haxe::io::Bytes bytes);
-		static ::Dynamic saveBytes_dyn();
-
-		static  ::sys::io::FileInput read(::String path,::hx::Null< bool >  binary);
-		static ::Dynamic read_dyn();
-
-		static  ::sys::io::FileOutput write(::String path,::hx::Null< bool >  binary);
-		static ::Dynamic write_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace io
-
-#endif /* INCLUDED_sys_io_File */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/io/FileInput.h b/Sources/c_snikket/iinclude/include/sys/io/FileInput.h
deleted file mode 100644
index 8cd622d..0000000
--- a/Sources/c_snikket/iinclude/include/sys/io/FileInput.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_io_FileInput
-#define INCLUDED_sys_io_FileInput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Input
-#include <haxe/io/Input.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(sys,io,FileInput)
-
-namespace sys{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES FileInput_obj : public  ::haxe::io::Input_obj
-{
-	public:
-		typedef  ::haxe::io::Input_obj super;
-		typedef FileInput_obj OBJ_;
-		FileInput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1a1fbc7b };
-
-		void __construct( ::Dynamic f);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.io.FileInput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.io.FileInput"); }
-		static ::hx::ObjectPtr< FileInput_obj > __new( ::Dynamic f);
-		static ::hx::ObjectPtr< FileInput_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic f);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FileInput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("FileInput",ce,43,18,62); }
-
-		 ::Dynamic _hx___f;
-		int readByte();
-
-		int readBytes( ::haxe::io::Bytes s,int p,int l);
-
-		void close();
-
-};
-
-} // end namespace sys
-} // end namespace io
-
-#endif /* INCLUDED_sys_io_FileInput */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/io/FileOutput.h b/Sources/c_snikket/iinclude/include/sys/io/FileOutput.h
deleted file mode 100644
index 9bcf940..0000000
--- a/Sources/c_snikket/iinclude/include/sys/io/FileOutput.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_io_FileOutput
-#define INCLUDED_sys_io_FileOutput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Output
-#include <haxe/io/Output.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS2(sys,io,FileOutput)
-
-namespace sys{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES FileOutput_obj : public  ::haxe::io::Output_obj
-{
-	public:
-		typedef  ::haxe::io::Output_obj super;
-		typedef FileOutput_obj OBJ_;
-		FileOutput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x32387970 };
-
-		void __construct( ::Dynamic f);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.io.FileOutput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.io.FileOutput"); }
-		static ::hx::ObjectPtr< FileOutput_obj > __new( ::Dynamic f);
-		static ::hx::ObjectPtr< FileOutput_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic f);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FileOutput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("FileOutput",bd,5a,b6,e3); }
-
-		 ::Dynamic _hx___f;
-		void writeByte(int c);
-
-		int writeBytes( ::haxe::io::Bytes s,int p,int l);
-
-		void close();
-
-};
-
-} // end namespace sys
-} // end namespace io
-
-#endif /* INCLUDED_sys_io_FileOutput */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/io/Process.h b/Sources/c_snikket/iinclude/include/sys/io/Process.h
deleted file mode 100644
index d4386c5..0000000
--- a/Sources/c_snikket/iinclude/include/sys/io/Process.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_io_Process
-#define INCLUDED_sys_io_Process
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS2(sys,io,Process)
-
-namespace sys{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES Process_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Process_obj OBJ_;
-		Process_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7a155cb0 };
-
-		void __construct(::String cmd,::Array< ::String > args, ::Dynamic detached);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.io.Process")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.io.Process"); }
-		static ::hx::ObjectPtr< Process_obj > __new(::String cmd,::Array< ::String > args, ::Dynamic detached);
-		static ::hx::ObjectPtr< Process_obj > __alloc(::hx::Ctx *_hx_ctx,::String cmd,::Array< ::String > args, ::Dynamic detached);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Process_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Process",4f,ca,9b,be); }
-
-		 ::Dynamic p;
-		 ::haxe::io::Input _hx_stdout;
-		 ::haxe::io::Input _hx_stderr;
-		 ::haxe::io::Output _hx_stdin;
-		 ::Dynamic exitCode(::hx::Null< bool >  block);
-		::Dynamic exitCode_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace io
-
-#endif /* INCLUDED_sys_io_Process */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/io/_Process/Stdin.h b/Sources/c_snikket/iinclude/include/sys/io/_Process/Stdin.h
deleted file mode 100644
index 473d06a..0000000
--- a/Sources/c_snikket/iinclude/include/sys/io/_Process/Stdin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_io__Process_Stdin
-#define INCLUDED_sys_io__Process_Stdin
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Output
-#include <haxe/io/Output.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS3(sys,io,_Process,Stdin)
-
-namespace sys{
-namespace io{
-namespace _Process{
-
-
-class HXCPP_CLASS_ATTRIBUTES Stdin_obj : public  ::haxe::io::Output_obj
-{
-	public:
-		typedef  ::haxe::io::Output_obj super;
-		typedef Stdin_obj OBJ_;
-		Stdin_obj();
-
-	public:
-		enum { _hx_ClassId = 0x037481cd };
-
-		void __construct( ::Dynamic p);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.io._Process.Stdin")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.io._Process.Stdin"); }
-		static ::hx::ObjectPtr< Stdin_obj > __new( ::Dynamic p);
-		static ::hx::ObjectPtr< Stdin_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic p);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Stdin_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Stdin",28,23,3b,17); }
-
-		 ::Dynamic p;
-		 ::haxe::io::Bytes buf;
-		void close();
-
-		void writeByte(int c);
-
-		int writeBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-};
-
-} // end namespace sys
-} // end namespace io
-} // end namespace _Process
-
-#endif /* INCLUDED_sys_io__Process_Stdin */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/io/_Process/Stdout.h b/Sources/c_snikket/iinclude/include/sys/io/_Process/Stdout.h
deleted file mode 100644
index 0533216..0000000
--- a/Sources/c_snikket/iinclude/include/sys/io/_Process/Stdout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_io__Process_Stdout
-#define INCLUDED_sys_io__Process_Stdout
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Input
-#include <haxe/io/Input.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS3(sys,io,_Process,Stdout)
-
-namespace sys{
-namespace io{
-namespace _Process{
-
-
-class HXCPP_CLASS_ATTRIBUTES Stdout_obj : public  ::haxe::io::Input_obj
-{
-	public:
-		typedef  ::haxe::io::Input_obj super;
-		typedef Stdout_obj OBJ_;
-		Stdout_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2316116e };
-
-		void __construct( ::Dynamic p,bool out);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.io._Process.Stdout")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.io._Process.Stdout"); }
-		static ::hx::ObjectPtr< Stdout_obj > __new( ::Dynamic p,bool out);
-		static ::hx::ObjectPtr< Stdout_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic p,bool out);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Stdout_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Stdout",eb,33,88,3c); }
-
-		 ::Dynamic p;
-		bool out;
-		 ::haxe::io::Bytes buf;
-		int readByte();
-
-		int readBytes( ::haxe::io::Bytes str,int pos,int len);
-
-};
-
-} // end namespace sys
-} // end namespace io
-} // end namespace _Process
-
-#endif /* INCLUDED_sys_io__Process_Stdout */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/net/Host.h b/Sources/c_snikket/iinclude/include/sys/net/Host.h
deleted file mode 100644
index 0fe42fa..0000000
--- a/Sources/c_snikket/iinclude/include/sys/net/Host.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_net_Host
-#define INCLUDED_sys_net_Host
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_87d3457c074e81a3_35_new)
-HX_DECLARE_CLASS2(sys,net,Host)
-
-namespace sys{
-namespace net{
-
-
-class HXCPP_CLASS_ATTRIBUTES Host_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Host_obj OBJ_;
-		Host_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6c3d7e78 };
-
-		void __construct(::String name);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.net.Host")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.net.Host"); }
-
-		inline static ::hx::ObjectPtr< Host_obj > __new(::String name) {
-			::hx::ObjectPtr< Host_obj > __this = new Host_obj();
-			__this->__construct(name);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Host_obj > __alloc(::hx::Ctx *_hx_ctx,::String name) {
-			Host_obj *__this = (Host_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Host_obj), true, "sys.net.Host"));
-			*(void **)__this = Host_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_87d3457c074e81a3_35_new)
-HXLINE(  36)		( ( ::sys::net::Host)(__this) )->host = name;
-HXLINE(  37)		try {
-            			HX_STACK_CATCHABLE( ::Dynamic, 0);
-HXLINE(  38)			( ( ::sys::net::Host)(__this) )->ip = _hx_std_host_resolve(name);
-            		} catch( ::Dynamic _hx_e) {
-            			if (_hx_e.IsClass<  ::Dynamic >() ){
-            				HX_STACK_BEGIN_CATCH
-            				 ::Dynamic _g = _hx_e;
-HXLINE(  39)				{
-HXLINE(  39)					null();
-            				}
-HXLINE(  40)				( ( ::sys::net::Host)(__this) )->ipv6 = _hx_std_host_resolve_ipv6(name);
-            			}
-            			else {
-            				HX_STACK_DO_THROW(_hx_e);
-            			}
-            		}
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Host_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		static void __init__();
-
-		::String __ToString() const { return HX_("Host",88,fb,eb,2f); }
-
-		static void __boot();
-		::String host;
-		int ip;
-		::Array< unsigned char > ipv6;
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace net
-
-#endif /* INCLUDED_sys_net_Host */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/net/Socket.h b/Sources/c_snikket/iinclude/include/sys/net/Socket.h
deleted file mode 100644
index c1426ac..0000000
--- a/Sources/c_snikket/iinclude/include/sys/net/Socket.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_net_Socket
-#define INCLUDED_sys_net_Socket
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS2(sys,net,Host)
-HX_DECLARE_CLASS2(sys,net,Socket)
-
-namespace sys{
-namespace net{
-
-
-class HXCPP_CLASS_ATTRIBUTES Socket_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Socket_obj OBJ_;
-		Socket_obj();
-
-	public:
-		enum { _hx_ClassId = 0x70c71ec3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.net.Socket")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.net.Socket"); }
-		static ::hx::ObjectPtr< Socket_obj > __new();
-		static ::hx::ObjectPtr< Socket_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Socket_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Socket",d3,ff,da,5a); }
-
-		 ::Dynamic __s;
-		Float _hx___timeout;
-		bool _hx___blocking;
-		bool _hx___fastSend;
-		 ::haxe::io::Input input;
-		 ::haxe::io::Output output;
-		virtual void init();
-		::Dynamic init_dyn();
-
-		virtual void close();
-		::Dynamic close_dyn();
-
-		virtual void connect( ::sys::net::Host host,int port);
-		::Dynamic connect_dyn();
-
-		void shutdown(bool read,bool write);
-		::Dynamic shutdown_dyn();
-
-		void setTimeout(Float timeout);
-		::Dynamic setTimeout_dyn();
-
-		void setBlocking(bool b);
-		::Dynamic setBlocking_dyn();
-
-		void setFastSend(bool b);
-		::Dynamic setFastSend_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace net
-
-#endif /* INCLUDED_sys_net_Socket */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/net/_Socket/SocketInput.h b/Sources/c_snikket/iinclude/include/sys/net/_Socket/SocketInput.h
deleted file mode 100644
index 7c6907c..0000000
--- a/Sources/c_snikket/iinclude/include/sys/net/_Socket/SocketInput.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_net__Socket_SocketInput
-#define INCLUDED_sys_net__Socket_SocketInput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Input
-#include <haxe/io/Input.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS3(sys,net,_Socket,SocketInput)
-
-namespace sys{
-namespace net{
-namespace _Socket{
-
-
-class HXCPP_CLASS_ATTRIBUTES SocketInput_obj : public  ::haxe::io::Input_obj
-{
-	public:
-		typedef  ::haxe::io::Input_obj super;
-		typedef SocketInput_obj OBJ_;
-		SocketInput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x342d0eb5 };
-
-		void __construct( ::Dynamic s);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.net._Socket.SocketInput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.net._Socket.SocketInput"); }
-		static ::hx::ObjectPtr< SocketInput_obj > __new( ::Dynamic s);
-		static ::hx::ObjectPtr< SocketInput_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic s);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SocketInput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SocketInput",37,f7,80,be); }
-
-		 ::Dynamic __s;
-		int readByte();
-
-		int readBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-		void close();
-
-};
-
-} // end namespace sys
-} // end namespace net
-} // end namespace _Socket
-
-#endif /* INCLUDED_sys_net__Socket_SocketInput */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/net/_Socket/SocketOutput.h b/Sources/c_snikket/iinclude/include/sys/net/_Socket/SocketOutput.h
deleted file mode 100644
index 2c685e5..0000000
--- a/Sources/c_snikket/iinclude/include/sys/net/_Socket/SocketOutput.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_net__Socket_SocketOutput
-#define INCLUDED_sys_net__Socket_SocketOutput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Output
-#include <haxe/io/Output.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS3(sys,net,_Socket,SocketOutput)
-
-namespace sys{
-namespace net{
-namespace _Socket{
-
-
-class HXCPP_CLASS_ATTRIBUTES SocketOutput_obj : public  ::haxe::io::Output_obj
-{
-	public:
-		typedef  ::haxe::io::Output_obj super;
-		typedef SocketOutput_obj OBJ_;
-		SocketOutput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x05556112 };
-
-		void __construct( ::Dynamic s);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.net._Socket.SocketOutput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.net._Socket.SocketOutput"); }
-		static ::hx::ObjectPtr< SocketOutput_obj > __new( ::Dynamic s);
-		static ::hx::ObjectPtr< SocketOutput_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic s);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SocketOutput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SocketOutput",34,a3,ea,62); }
-
-		 ::Dynamic __s;
-		void writeByte(int c);
-
-		int writeBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-		void close();
-
-};
-
-} // end namespace sys
-} // end namespace net
-} // end namespace _Socket
-
-#endif /* INCLUDED_sys_net__Socket_SocketOutput */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/ssl/Certificate.h b/Sources/c_snikket/iinclude/include/sys/ssl/Certificate.h
deleted file mode 100644
index c0b6746..0000000
--- a/Sources/c_snikket/iinclude/include/sys/ssl/Certificate.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_ssl_Certificate
-#define INCLUDED_sys_ssl_Certificate
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_15e02723fb84005c_33_new)
-HX_DECLARE_CLASS2(sys,ssl,Certificate)
-
-namespace sys{
-namespace ssl{
-
-
-class HXCPP_CLASS_ATTRIBUTES Certificate_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Certificate_obj OBJ_;
-		Certificate_obj();
-
-	public:
-		enum { _hx_ClassId = 0x205b2370 };
-
-		void __construct( ::Dynamic x, ::sys::ssl::Certificate h);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.ssl.Certificate")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.ssl.Certificate"); }
-
-		inline static ::hx::ObjectPtr< Certificate_obj > __new( ::Dynamic x, ::sys::ssl::Certificate h) {
-			::hx::ObjectPtr< Certificate_obj > __this = new Certificate_obj();
-			__this->__construct(x,h);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Certificate_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic x, ::sys::ssl::Certificate h) {
-			Certificate_obj *__this = (Certificate_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Certificate_obj), true, "sys.ssl.Certificate"));
-			*(void **)__this = Certificate_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_15e02723fb84005c_33_new)
-HXLINE(  34)		( ( ::sys::ssl::Certificate)(__this) )->_hx___x = x;
-HXLINE(  35)		( ( ::sys::ssl::Certificate)(__this) )->_hx___h = h;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Certificate_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		static void __init__();
-
-		::String __ToString() const { return HX_("Certificate",f7,60,75,ff); }
-
-		static void __boot();
-		static  ::sys::ssl::Certificate loadFile(::String file);
-		static ::Dynamic loadFile_dyn();
-
-		static  ::sys::ssl::Certificate loadPath(::String path);
-		static ::Dynamic loadPath_dyn();
-
-		static  ::sys::ssl::Certificate loadDefaults();
-		static ::Dynamic loadDefaults_dyn();
-
-		 ::sys::ssl::Certificate _hx___h;
-		 ::Dynamic _hx___x;
-};
-
-} // end namespace sys
-} // end namespace ssl
-
-#endif /* INCLUDED_sys_ssl_Certificate */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/ssl/Key.h b/Sources/c_snikket/iinclude/include/sys/ssl/Key.h
deleted file mode 100644
index 68e01fd..0000000
--- a/Sources/c_snikket/iinclude/include/sys/ssl/Key.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_ssl_Key
-#define INCLUDED_sys_ssl_Key
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_360df8ce648879c1_34_new)
-HX_DECLARE_CLASS2(sys,ssl,Key)
-
-namespace sys{
-namespace ssl{
-
-
-class HXCPP_CLASS_ATTRIBUTES Key_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Key_obj OBJ_;
-		Key_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6dab52dc };
-
-		void __construct( ::Dynamic k);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.ssl.Key")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.ssl.Key"); }
-
-		inline static ::hx::ObjectPtr< Key_obj > __new( ::Dynamic k) {
-			::hx::ObjectPtr< Key_obj > __this = new Key_obj();
-			__this->__construct(k);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Key_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic k) {
-			Key_obj *__this = (Key_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Key_obj), true, "sys.ssl.Key"));
-			*(void **)__this = Key_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_360df8ce648879c1_34_new)
-HXDLIN(  34)		( ( ::sys::ssl::Key)(__this) )->_hx___k = k;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Key_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		static void __init__();
-
-		::String __ToString() const { return HX_("Key",7f,41,39,00); }
-
-		static void __boot();
-		 ::Dynamic _hx___k;
-};
-
-} // end namespace sys
-} // end namespace ssl
-
-#endif /* INCLUDED_sys_ssl_Key */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/ssl/Socket.h b/Sources/c_snikket/iinclude/include/sys/ssl/Socket.h
deleted file mode 100644
index 97bacfe..0000000
--- a/Sources/c_snikket/iinclude/include/sys/ssl/Socket.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_ssl_Socket
-#define INCLUDED_sys_ssl_Socket
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_sys_net_Socket
-#include <sys/net/Socket.h>
-#endif
-HX_DECLARE_CLASS2(sys,net,Host)
-HX_DECLARE_CLASS2(sys,net,Socket)
-HX_DECLARE_CLASS2(sys,ssl,Certificate)
-HX_DECLARE_CLASS2(sys,ssl,Key)
-HX_DECLARE_CLASS2(sys,ssl,Socket)
-
-namespace sys{
-namespace ssl{
-
-
-class HXCPP_CLASS_ATTRIBUTES Socket_obj : public  ::sys::net::Socket_obj
-{
-	public:
-		typedef  ::sys::net::Socket_obj super;
-		typedef Socket_obj OBJ_;
-		Socket_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7a492a0e };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.ssl.Socket")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.ssl.Socket"); }
-		static ::hx::ObjectPtr< Socket_obj > __new();
-		static ::hx::ObjectPtr< Socket_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Socket_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		static void __init__();
-
-		::String __ToString() const { return HX_("Socket",d3,ff,da,5a); }
-
-		static void __boot();
-		static  ::Dynamic DEFAULT_VERIFY_CERT;
-		static  ::sys::ssl::Certificate DEFAULT_CA;
-		 ::Dynamic conf;
-		 ::Dynamic ssl;
-		 ::Dynamic verifyCert;
-		 ::sys::ssl::Certificate caCert;
-		::String hostname;
-		 ::sys::ssl::Certificate ownCert;
-		 ::sys::ssl::Key ownKey;
-		::Array< ::Dynamic> altSNIContexts;
-		 ::Dynamic sniCallback;
-		bool handshakeDone;
-		void init();
-
-		void connect( ::sys::net::Host host,int port);
-
-		void handshake();
-		::Dynamic handshake_dyn();
-
-		void close();
-
-		 ::Dynamic buildSSLConfig(bool server);
-		::Dynamic buildSSLConfig_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace ssl
-
-#endif /* INCLUDED_sys_ssl_Socket */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/ssl/_Socket/SocketInput.h b/Sources/c_snikket/iinclude/include/sys/ssl/_Socket/SocketInput.h
deleted file mode 100644
index 7fa83ba..0000000
--- a/Sources/c_snikket/iinclude/include/sys/ssl/_Socket/SocketInput.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_ssl__Socket_SocketInput
-#define INCLUDED_sys_ssl__Socket_SocketInput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Input
-#include <haxe/io/Input.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(sys,net,Socket)
-HX_DECLARE_CLASS2(sys,ssl,Socket)
-HX_DECLARE_CLASS3(sys,ssl,_Socket,SocketInput)
-
-namespace sys{
-namespace ssl{
-namespace _Socket{
-
-
-class HXCPP_CLASS_ATTRIBUTES SocketInput_obj : public  ::haxe::io::Input_obj
-{
-	public:
-		typedef  ::haxe::io::Input_obj super;
-		typedef SocketInput_obj OBJ_;
-		SocketInput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5d27522c };
-
-		void __construct( ::sys::ssl::Socket s);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.ssl._Socket.SocketInput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.ssl._Socket.SocketInput"); }
-		static ::hx::ObjectPtr< SocketInput_obj > __new( ::sys::ssl::Socket s);
-		static ::hx::ObjectPtr< SocketInput_obj > __alloc(::hx::Ctx *_hx_ctx, ::sys::ssl::Socket s);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SocketInput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SocketInput",37,f7,80,be); }
-
-		 ::sys::ssl::Socket __s;
-		int readByte();
-
-		int readBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-		void close();
-
-};
-
-} // end namespace sys
-} // end namespace ssl
-} // end namespace _Socket
-
-#endif /* INCLUDED_sys_ssl__Socket_SocketInput */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/ssl/_Socket/SocketOutput.h b/Sources/c_snikket/iinclude/include/sys/ssl/_Socket/SocketOutput.h
deleted file mode 100644
index 6282196..0000000
--- a/Sources/c_snikket/iinclude/include/sys/ssl/_Socket/SocketOutput.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_ssl__Socket_SocketOutput
-#define INCLUDED_sys_ssl__Socket_SocketOutput
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_io_Output
-#include <haxe/io/Output.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS2(sys,net,Socket)
-HX_DECLARE_CLASS2(sys,ssl,Socket)
-HX_DECLARE_CLASS3(sys,ssl,_Socket,SocketOutput)
-
-namespace sys{
-namespace ssl{
-namespace _Socket{
-
-
-class HXCPP_CLASS_ATTRIBUTES SocketOutput_obj : public  ::haxe::io::Output_obj
-{
-	public:
-		typedef  ::haxe::io::Output_obj super;
-		typedef SocketOutput_obj OBJ_;
-		SocketOutput_obj();
-
-	public:
-		enum { _hx_ClassId = 0x52cf5067 };
-
-		void __construct( ::sys::ssl::Socket s);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.ssl._Socket.SocketOutput")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.ssl._Socket.SocketOutput"); }
-		static ::hx::ObjectPtr< SocketOutput_obj > __new( ::sys::ssl::Socket s);
-		static ::hx::ObjectPtr< SocketOutput_obj > __alloc(::hx::Ctx *_hx_ctx, ::sys::ssl::Socket s);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SocketOutput_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SocketOutput",34,a3,ea,62); }
-
-		 ::sys::ssl::Socket __s;
-		void writeByte(int c);
-
-		int writeBytes( ::haxe::io::Bytes buf,int pos,int len);
-
-		void close();
-
-};
-
-} // end namespace sys
-} // end namespace ssl
-} // end namespace _Socket
-
-#endif /* INCLUDED_sys_ssl__Socket_SocketOutput */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/EventLoop.h b/Sources/c_snikket/iinclude/include/sys/thread/EventLoop.h
deleted file mode 100644
index e5d0fee..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/EventLoop.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread_EventLoop
-#define INCLUDED_sys_thread_EventLoop
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sys,thread,EventLoop)
-HX_DECLARE_CLASS2(sys,thread,Lock)
-HX_DECLARE_CLASS2(sys,thread,Mutex)
-HX_DECLARE_CLASS3(sys,thread,_EventLoop,RegularEvent)
-
-namespace sys{
-namespace thread{
-
-
-class HXCPP_CLASS_ATTRIBUTES EventLoop_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EventLoop_obj OBJ_;
-		EventLoop_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6a581147 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.EventLoop")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.EventLoop"); }
-		static ::hx::ObjectPtr< EventLoop_obj > __new();
-		static ::hx::ObjectPtr< EventLoop_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EventLoop_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("EventLoop",7e,8f,97,98); }
-
-		static bool CREATED;
-		 ::sys::thread::Mutex mutex;
-		::Array< ::Dynamic> oneTimeEvents;
-		int oneTimeEventsIdx;
-		 ::sys::thread::Lock waitLock;
-		int promisedEventsCount;
-		 ::sys::thread::_EventLoop::RegularEvent regularEvents;
-		bool isMainThread;
-		 ::sys::thread::_EventLoop::RegularEvent repeat( ::Dynamic event,int intervalMs);
-		::Dynamic repeat_dyn();
-
-		void cancel( ::sys::thread::_EventLoop::RegularEvent eventHandler);
-		::Dynamic cancel_dyn();
-
-		void run( ::Dynamic event);
-		::Dynamic run_dyn();
-
-		bool wait( ::Dynamic timeout);
-		::Dynamic wait_dyn();
-
-		void loop();
-		::Dynamic loop_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace thread
-
-#endif /* INCLUDED_sys_thread_EventLoop */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/Lock.h b/Sources/c_snikket/iinclude/include/sys/thread/Lock.h
deleted file mode 100644
index b08cb6e..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/Lock.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread_Lock
-#define INCLUDED_sys_thread_Lock
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_c256ff93ff467723_30_new)
-HX_DECLARE_CLASS2(sys,thread,Lock)
-
-namespace sys{
-namespace thread{
-
-
-class HXCPP_CLASS_ATTRIBUTES Lock_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Lock_obj OBJ_;
-		Lock_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7fa5e9e6 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.Lock")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.Lock"); }
-
-		inline static ::hx::ObjectPtr< Lock_obj > __new() {
-			::hx::ObjectPtr< Lock_obj > __this = new Lock_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Lock_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Lock_obj *__this = (Lock_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Lock_obj), true, "sys.thread.Lock"));
-			*(void **)__this = Lock_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_c256ff93ff467723_30_new)
-HXDLIN(  30)		( ( ::sys::thread::Lock)(__this) )->l =  ::__hxcpp_lock_create();
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Lock_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Lock",0b,c8,90,32); }
-
-		 ::Dynamic l;
-		bool wait( ::Dynamic timeout);
-		::Dynamic wait_dyn();
-
-		void release();
-		::Dynamic release_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace thread
-
-#endif /* INCLUDED_sys_thread_Lock */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/Mutex.h b/Sources/c_snikket/iinclude/include/sys/thread/Mutex.h
deleted file mode 100644
index 7dcf304..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/Mutex.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread_Mutex
-#define INCLUDED_sys_thread_Mutex
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_2ef35e640612cac3_30_new)
-HX_DECLARE_CLASS2(sys,thread,Mutex)
-
-namespace sys{
-namespace thread{
-
-
-class HXCPP_CLASS_ATTRIBUTES Mutex_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Mutex_obj OBJ_;
-		Mutex_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5474b30c };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.Mutex")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.Mutex"); }
-
-		inline static ::hx::ObjectPtr< Mutex_obj > __new() {
-			::hx::ObjectPtr< Mutex_obj > __this = new Mutex_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Mutex_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Mutex_obj *__this = (Mutex_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Mutex_obj), true, "sys.thread.Mutex"));
-			*(void **)__this = Mutex_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_2ef35e640612cac3_30_new)
-HXDLIN(  30)		( ( ::sys::thread::Mutex)(__this) )->m =  ::__hxcpp_mutex_create();
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Mutex_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Mutex",5f,ff,88,a3); }
-
-		 ::Dynamic m;
-		void acquire();
-		::Dynamic acquire_dyn();
-
-		void release();
-		::Dynamic release_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace thread
-
-#endif /* INCLUDED_sys_thread_Mutex */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/NoEventLoopException.h b/Sources/c_snikket/iinclude/include/sys/thread/NoEventLoopException.h
deleted file mode 100644
index 836f0ff..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/NoEventLoopException.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread_NoEventLoopException
-#define INCLUDED_sys_thread_NoEventLoopException
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_haxe_Exception
-#include <haxe/Exception.h>
-#endif
-HX_DECLARE_STACK_FRAME(_hx_pos_c0f6a7d563b0a42e_7_new)
-HX_DECLARE_CLASS1(haxe,Exception)
-HX_DECLARE_CLASS2(sys,thread,NoEventLoopException)
-
-namespace sys{
-namespace thread{
-
-
-class HXCPP_CLASS_ATTRIBUTES NoEventLoopException_obj : public  ::haxe::Exception_obj
-{
-	public:
-		typedef  ::haxe::Exception_obj super;
-		typedef NoEventLoopException_obj OBJ_;
-		NoEventLoopException_obj();
-
-	public:
-		enum { _hx_ClassId = 0x00a9e885 };
-
-		void __construct(::String __o_msg, ::haxe::Exception previous);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.NoEventLoopException")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.NoEventLoopException"); }
-
-		inline static ::hx::ObjectPtr< NoEventLoopException_obj > __new(::String __o_msg, ::haxe::Exception previous) {
-			::hx::ObjectPtr< NoEventLoopException_obj > __this = new NoEventLoopException_obj();
-			__this->__construct(__o_msg,previous);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< NoEventLoopException_obj > __alloc(::hx::Ctx *_hx_ctx,::String __o_msg, ::haxe::Exception previous) {
-			NoEventLoopException_obj *__this = (NoEventLoopException_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(NoEventLoopException_obj), true, "sys.thread.NoEventLoopException"));
-			*(void **)__this = NoEventLoopException_obj::_hx_vtable;
-{
-            		::String msg = __o_msg;
-            		if (::hx::IsNull(__o_msg)) msg = HX_("Event loop is not available. Refer to sys.thread.Thread.runWithEventLoop.",89,e6,4c,1c);
-            	HX_STACKFRAME(&_hx_pos_c0f6a7d563b0a42e_7_new)
-HXDLIN(   7)		__this->super::__construct(msg,previous,null());
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~NoEventLoopException_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("NoEventLoopException",92,71,e8,a8); }
-
-};
-
-} // end namespace sys
-} // end namespace thread
-
-#endif /* INCLUDED_sys_thread_NoEventLoopException */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/_EventLoop/RegularEvent.h b/Sources/c_snikket/iinclude/include/sys/thread/_EventLoop/RegularEvent.h
deleted file mode 100644
index e91ddab..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/_EventLoop/RegularEvent.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread__EventLoop_RegularEvent
-#define INCLUDED_sys_thread__EventLoop_RegularEvent
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_692c76051dac6459_278_new)
-HX_DECLARE_CLASS3(sys,thread,_EventLoop,RegularEvent)
-
-namespace sys{
-namespace thread{
-namespace _EventLoop{
-
-
-class HXCPP_CLASS_ATTRIBUTES RegularEvent_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef RegularEvent_obj OBJ_;
-		RegularEvent_obj();
-
-	public:
-		enum { _hx_ClassId = 0x13f58728 };
-
-		void __construct( ::Dynamic run,Float nextRunTime,Float interval);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread._EventLoop.RegularEvent")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread._EventLoop.RegularEvent"); }
-
-		inline static ::hx::ObjectPtr< RegularEvent_obj > __new( ::Dynamic run,Float nextRunTime,Float interval) {
-			::hx::ObjectPtr< RegularEvent_obj > __this = new RegularEvent_obj();
-			__this->__construct(run,nextRunTime,interval);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< RegularEvent_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic run,Float nextRunTime,Float interval) {
-			RegularEvent_obj *__this = (RegularEvent_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(RegularEvent_obj), true, "sys.thread._EventLoop.RegularEvent"));
-			*(void **)__this = RegularEvent_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_692c76051dac6459_278_new)
-HXLINE( 284)		( ( ::sys::thread::_EventLoop::RegularEvent)(__this) )->cancelled = false;
-HXLINE( 287)		( ( ::sys::thread::_EventLoop::RegularEvent)(__this) )->run = run;
-HXLINE( 288)		( ( ::sys::thread::_EventLoop::RegularEvent)(__this) )->nextRunTime = nextRunTime;
-HXLINE( 289)		( ( ::sys::thread::_EventLoop::RegularEvent)(__this) )->interval = interval;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~RegularEvent_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("RegularEvent",3e,24,e8,2d); }
-
-		Float nextRunTime;
-		Float interval;
-		 ::Dynamic run;
-		Dynamic run_dyn() { return run;}
-		 ::sys::thread::_EventLoop::RegularEvent next;
-		 ::sys::thread::_EventLoop::RegularEvent previous;
-		bool cancelled;
-};
-
-} // end namespace sys
-} // end namespace thread
-} // end namespace _EventLoop
-
-#endif /* INCLUDED_sys_thread__EventLoop_RegularEvent */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/_Thread/HaxeThread.h b/Sources/c_snikket/iinclude/include/sys/thread/_Thread/HaxeThread.h
deleted file mode 100644
index 80f44f1..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/_Thread/HaxeThread.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread__Thread_HaxeThread
-#define INCLUDED_sys_thread__Thread_HaxeThread
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sys,thread,EventLoop)
-HX_DECLARE_CLASS2(sys,thread,Mutex)
-HX_DECLARE_CLASS3(sys,thread,_Thread,HaxeThread)
-
-namespace sys{
-namespace thread{
-namespace _Thread{
-
-
-class HXCPP_CLASS_ATTRIBUTES HaxeThread_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HaxeThread_obj OBJ_;
-		HaxeThread_obj();
-
-	public:
-		enum { _hx_ClassId = 0x72cf0b82 };
-
-		void __construct( ::Dynamic h);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread._Thread.HaxeThread")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread._Thread.HaxeThread"); }
-		static ::hx::ObjectPtr< HaxeThread_obj > __new( ::Dynamic h);
-		static ::hx::ObjectPtr< HaxeThread_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic h);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HaxeThread_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		static void __init__();
-
-		::String __ToString() const { return HX_("HaxeThread",b0,c7,55,fd); }
-
-		static void __boot();
-		static ::Array< ::Dynamic> threads;
-		static  ::sys::thread::Mutex threadsMutex;
-		static  ::Dynamic mainThreadHandle;
-		static  ::sys::thread::_Thread::HaxeThread mainThread;
-		static  ::sys::thread::_Thread::HaxeThread current();
-		static ::Dynamic current_dyn();
-
-		static  ::sys::thread::_Thread::HaxeThread create( ::Dynamic job,bool withEventLoop);
-		static ::Dynamic create_dyn();
-
-		static void dropThread( ::Dynamic item,int probableIndex);
-		static ::Dynamic dropThread_dyn();
-
-		 ::sys::thread::EventLoop events;
-		 ::Dynamic handle;
-};
-
-} // end namespace sys
-} // end namespace thread
-} // end namespace _Thread
-
-#endif /* INCLUDED_sys_thread__Thread_HaxeThread */ 
diff --git a/Sources/c_snikket/iinclude/include/sys/thread/_Thread/Thread_Impl_.h b/Sources/c_snikket/iinclude/include/sys/thread/_Thread/Thread_Impl_.h
deleted file mode 100644
index 1d125c1..0000000
--- a/Sources/c_snikket/iinclude/include/sys/thread/_Thread/Thread_Impl_.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_sys_thread__Thread_Thread_Impl_
-#define INCLUDED_sys_thread__Thread_Thread_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(sys,thread,EventLoop)
-HX_DECLARE_CLASS3(sys,thread,_Thread,HaxeThread)
-HX_DECLARE_CLASS3(sys,thread,_Thread,Thread_Impl_)
-
-namespace sys{
-namespace thread{
-namespace _Thread{
-
-
-class HXCPP_CLASS_ATTRIBUTES Thread_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Thread_Impl__obj OBJ_;
-		Thread_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x3097b824 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="sys.thread._Thread.Thread_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"sys.thread._Thread.Thread_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Thread_Impl__obj > __new() {
-			::hx::ObjectPtr< Thread_Impl__obj > __this = new Thread_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Thread_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Thread_Impl__obj *__this = (Thread_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Thread_Impl__obj), false, "sys.thread._Thread.Thread_Impl_"));
-			*(void **)__this = Thread_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Thread_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Thread_Impl_",0a,37,9c,fe); }
-
-		static  ::sys::thread::EventLoop get_events( ::sys::thread::_Thread::HaxeThread this1);
-		static ::Dynamic get_events_dyn();
-
-		static void processEvents();
-		static ::Dynamic processEvents_dyn();
-
-};
-
-} // end namespace sys
-} // end namespace thread
-} // end namespace _Thread
-
-#endif /* INCLUDED_sys_thread__Thread_Thread_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/PromiseFactory.h b/Sources/c_snikket/iinclude/include/thenshim/PromiseFactory.h
deleted file mode 100644
index 1fd53c5..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/PromiseFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_PromiseFactory
-#define INCLUDED_thenshim_PromiseFactory
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(thenshim,PromiseFactory)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace thenshim{
-
-
-class HXCPP_CLASS_ATTRIBUTES PromiseFactory_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		::Dynamic (::hx::Object :: *_hx_make)( ::Dynamic executor); 
-		static inline ::Dynamic make( ::Dynamic _hx_, ::Dynamic executor) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::thenshim::PromiseFactory_obj *>(_hx_.mPtr->_hx_getInterface(0x93a35865)))->_hx_make)(executor);
-		}
-		::Dynamic (::hx::Object :: *_hx_asResolved)( ::Dynamic object); 
-		static inline ::Dynamic asResolved( ::Dynamic _hx_, ::Dynamic object) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::thenshim::PromiseFactory_obj *>(_hx_.mPtr->_hx_getInterface(0x93a35865)))->_hx_asResolved)(object);
-		}
-		::Dynamic (::hx::Object :: *_hx_asRejected)( ::Dynamic reason); 
-		static inline ::Dynamic asRejected( ::Dynamic _hx_, ::Dynamic reason) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::thenshim::PromiseFactory_obj *>(_hx_.mPtr->_hx_getInterface(0x93a35865)))->_hx_asRejected)(reason);
-		}
-};
-
-} // end namespace thenshim
-
-#endif /* INCLUDED_thenshim_PromiseFactory */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/PromiseTools.h b/Sources/c_snikket/iinclude/include/thenshim/PromiseTools.h
deleted file mode 100644
index f854535..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/PromiseTools.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_PromiseTools
-#define INCLUDED_thenshim_PromiseTools
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(thenshim,PromiseTools)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace thenshim{
-
-
-class HXCPP_CLASS_ATTRIBUTES PromiseTools_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef PromiseTools_obj OBJ_;
-		PromiseTools_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1873701a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="thenshim.PromiseTools")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"thenshim.PromiseTools"); }
-
-		inline static ::hx::ObjectPtr< PromiseTools_obj > __new() {
-			::hx::ObjectPtr< PromiseTools_obj > __this = new PromiseTools_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< PromiseTools_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			PromiseTools_obj *__this = (PromiseTools_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(PromiseTools_obj), false, "thenshim.PromiseTools"));
-			*(void **)__this = PromiseTools_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~PromiseTools_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("PromiseTools",a0,4e,2e,4d); }
-
-		static ::Dynamic all( ::Dynamic promises);
-		static ::Dynamic all_dyn();
-
-		static ::Dynamic catch_(::Dynamic promise, ::Dynamic onRejected);
-		static ::Dynamic catch__dyn();
-
-};
-
-} // end namespace thenshim
-
-#endif /* INCLUDED_thenshim_PromiseTools */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/Thenable.h b/Sources/c_snikket/iinclude/include/thenshim/Thenable.h
deleted file mode 100644
index 66c521e..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/Thenable.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_Thenable
-#define INCLUDED_thenshim_Thenable
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(thenshim,Thenable)
-
-namespace thenshim{
-
-
-class HXCPP_CLASS_ATTRIBUTES Thenable_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		::Dynamic (::hx::Object :: *_hx_then)( ::Dynamic onFulfilled, ::Dynamic onRejected); 
-		static inline ::Dynamic then( ::Dynamic _hx_, ::Dynamic onFulfilled, ::Dynamic onRejected) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::thenshim::Thenable_obj *>(_hx_.mPtr->_hx_getInterface(0xc019ce6d)))->_hx_then)(onFulfilled,onRejected);
-		}
-};
-
-} // end namespace thenshim
-
-#endif /* INCLUDED_thenshim_Thenable */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/_Promise/Promise_Impl_.h b/Sources/c_snikket/iinclude/include/thenshim/_Promise/Promise_Impl_.h
deleted file mode 100644
index 266087a..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/_Promise/Promise_Impl_.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim__Promise_Promise_Impl_
-#define INCLUDED_thenshim__Promise_Promise_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(thenshim,PromiseFactory)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-HX_DECLARE_CLASS2(thenshim,_Promise,Promise_Impl_)
-
-namespace thenshim{
-namespace _Promise{
-
-
-class HXCPP_CLASS_ATTRIBUTES Promise_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Promise_Impl__obj OBJ_;
-		Promise_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x048c0501 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="thenshim._Promise.Promise_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"thenshim._Promise.Promise_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Promise_Impl__obj > __new() {
-			::hx::ObjectPtr< Promise_Impl__obj > __this = new Promise_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Promise_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Promise_Impl__obj *__this = (Promise_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Promise_Impl__obj), false, "thenshim._Promise.Promise_Impl_"));
-			*(void **)__this = Promise_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Promise_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Promise_Impl_",5b,00,ba,be); }
-
-		static void __boot();
-		static ::Dynamic factory;
-		static ::Dynamic _new( ::Dynamic executor);
-		static ::Dynamic _new_dyn();
-
-		static ::Dynamic resolve( ::Dynamic object);
-		static ::Dynamic resolve_dyn();
-
-		static ::Dynamic reject( ::Dynamic reason);
-		static ::Dynamic reject_dyn();
-
-		static ::Dynamic then(::Dynamic this1, ::Dynamic onFulfilled, ::Dynamic onRejected);
-		static ::Dynamic then_dyn();
-
-};
-
-} // end namespace thenshim
-} // end namespace _Promise
-
-#endif /* INCLUDED_thenshim__Promise_Promise_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/fallback/FallbackPromise.h b/Sources/c_snikket/iinclude/include/thenshim/fallback/FallbackPromise.h
deleted file mode 100644
index 21e2936..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/fallback/FallbackPromise.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_fallback_FallbackPromise
-#define INCLUDED_thenshim_fallback_FallbackPromise
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_thenshim_Thenable
-#include <thenshim/Thenable.h>
-#endif
-HX_DECLARE_CLASS1(thenshim,Thenable)
-HX_DECLARE_CLASS2(thenshim,fallback,FallbackPromise)
-HX_DECLARE_CLASS2(thenshim,fallback,HandlerSession)
-HX_DECLARE_CLASS2(thenshim,fallback,PromiseState)
-HX_DECLARE_CLASS2(thenshim,fallback,TaskScheduler)
-
-namespace thenshim{
-namespace fallback{
-
-
-class HXCPP_CLASS_ATTRIBUTES FallbackPromise_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef FallbackPromise_obj OBJ_;
-		FallbackPromise_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6da4d981 };
-
-		void __construct( ::thenshim::fallback::TaskScheduler scheduler);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="thenshim.fallback.FallbackPromise")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"thenshim.fallback.FallbackPromise"); }
-		static ::hx::ObjectPtr< FallbackPromise_obj > __new( ::thenshim::fallback::TaskScheduler scheduler);
-		static ::hx::ObjectPtr< FallbackPromise_obj > __alloc(::hx::Ctx *_hx_ctx, ::thenshim::fallback::TaskScheduler scheduler);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FallbackPromise_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("FallbackPromise",79,35,7a,1c); }
-
-		 ::thenshim::fallback::TaskScheduler scheduler;
-		 ::thenshim::fallback::PromiseState state;
-		 ::Dynamic value;
-		 ::Dynamic reason;
-		::Array< ::Dynamic> sessions;
-		::Dynamic then( ::Dynamic onFulfilled, ::Dynamic onRejected);
-		::Dynamic then_dyn();
-
-		 ::thenshim::fallback::FallbackPromise thenImpl( ::Dynamic onFulfilled, ::Dynamic onRejected);
-		::Dynamic thenImpl_dyn();
-
-		void resolve( ::Dynamic value);
-		::Dynamic resolve_dyn();
-
-		void reject( ::Dynamic reason);
-		::Dynamic reject_dyn();
-
-};
-
-} // end namespace thenshim
-} // end namespace fallback
-
-#endif /* INCLUDED_thenshim_fallback_FallbackPromise */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/fallback/FallbackPromiseFactory.h b/Sources/c_snikket/iinclude/include/thenshim/fallback/FallbackPromiseFactory.h
deleted file mode 100644
index ecfa490..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/fallback/FallbackPromiseFactory.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_fallback_FallbackPromiseFactory
-#define INCLUDED_thenshim_fallback_FallbackPromiseFactory
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_thenshim_PromiseFactory
-#include <thenshim/PromiseFactory.h>
-#endif
-HX_DECLARE_CLASS1(thenshim,PromiseFactory)
-HX_DECLARE_CLASS1(thenshim,Thenable)
-HX_DECLARE_CLASS2(thenshim,fallback,FallbackPromiseFactory)
-HX_DECLARE_CLASS2(thenshim,fallback,TaskScheduler)
-
-namespace thenshim{
-namespace fallback{
-
-
-class HXCPP_CLASS_ATTRIBUTES FallbackPromiseFactory_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef FallbackPromiseFactory_obj OBJ_;
-		FallbackPromiseFactory_obj();
-
-	public:
-		enum { _hx_ClassId = 0x592d0d49 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="thenshim.fallback.FallbackPromiseFactory")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"thenshim.fallback.FallbackPromiseFactory"); }
-		static ::hx::ObjectPtr< FallbackPromiseFactory_obj > __new();
-		static ::hx::ObjectPtr< FallbackPromiseFactory_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FallbackPromiseFactory_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("FallbackPromiseFactory",51,a0,67,b6); }
-
-		 ::thenshim::fallback::TaskScheduler scheduler;
-		::Dynamic make( ::Dynamic executor);
-		::Dynamic make_dyn();
-
-		::Dynamic asResolved( ::Dynamic object);
-		::Dynamic asResolved_dyn();
-
-		::Dynamic asResolvedThenable(::Dynamic thenable);
-		::Dynamic asResolvedThenable_dyn();
-
-		::Dynamic asResolvedThenProperty( ::Dynamic object);
-		::Dynamic asResolvedThenProperty_dyn();
-
-		::Dynamic asRejected( ::Dynamic reason);
-		::Dynamic asRejected_dyn();
-
-};
-
-} // end namespace thenshim
-} // end namespace fallback
-
-#endif /* INCLUDED_thenshim_fallback_FallbackPromiseFactory */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/fallback/HandlerSession.h b/Sources/c_snikket/iinclude/include/thenshim/fallback/HandlerSession.h
deleted file mode 100644
index c9dc287..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/fallback/HandlerSession.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_fallback_HandlerSession
-#define INCLUDED_thenshim_fallback_HandlerSession
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(thenshim,Thenable)
-HX_DECLARE_CLASS2(thenshim,fallback,FallbackPromise)
-HX_DECLARE_CLASS2(thenshim,fallback,HandlerSession)
-HX_DECLARE_CLASS2(thenshim,fallback,TaskScheduler)
-
-namespace thenshim{
-namespace fallback{
-
-
-class HXCPP_CLASS_ATTRIBUTES HandlerSession_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HandlerSession_obj OBJ_;
-		HandlerSession_obj();
-
-	public:
-		enum { _hx_ClassId = 0x30baea8c };
-
-		void __construct( ::thenshim::fallback::TaskScheduler scheduler, ::Dynamic fulfilledCallback, ::Dynamic rejectedCallback);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="thenshim.fallback.HandlerSession")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"thenshim.fallback.HandlerSession"); }
-		static ::hx::ObjectPtr< HandlerSession_obj > __new( ::thenshim::fallback::TaskScheduler scheduler, ::Dynamic fulfilledCallback, ::Dynamic rejectedCallback);
-		static ::hx::ObjectPtr< HandlerSession_obj > __alloc(::hx::Ctx *_hx_ctx, ::thenshim::fallback::TaskScheduler scheduler, ::Dynamic fulfilledCallback, ::Dynamic rejectedCallback);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HandlerSession_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HandlerSession",cc,10,db,f7); }
-
-		static void resolvePromise( ::thenshim::fallback::FallbackPromise promise, ::Dynamic value);
-		static ::Dynamic resolvePromise_dyn();
-
-		static bool rejectIfSame( ::thenshim::fallback::FallbackPromise promise, ::Dynamic value);
-		static ::Dynamic rejectIfSame_dyn();
-
-		static void resolvePromiseThenable( ::thenshim::fallback::FallbackPromise promise,::Dynamic thenable);
-		static ::Dynamic resolvePromiseThenable_dyn();
-
-		static void resolvePromiseObject( ::thenshim::fallback::FallbackPromise promise, ::Dynamic object);
-		static ::Dynamic resolvePromiseObject_dyn();
-
-		 ::thenshim::fallback::FallbackPromise promise;
-		 ::thenshim::fallback::TaskScheduler scheduler;
-		 ::Dynamic fulfilledCallback;
-		 ::Dynamic rejectedCallback;
-		void resolve( ::Dynamic value);
-		::Dynamic resolve_dyn();
-
-		void resolveImpl( ::Dynamic value);
-		::Dynamic resolveImpl_dyn();
-
-		void reject( ::Dynamic reason);
-		::Dynamic reject_dyn();
-
-		void rejectImpl( ::Dynamic reason);
-		::Dynamic rejectImpl_dyn();
-
-};
-
-} // end namespace thenshim
-} // end namespace fallback
-
-#endif /* INCLUDED_thenshim_fallback_HandlerSession */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/fallback/PromiseState.h b/Sources/c_snikket/iinclude/include/thenshim/fallback/PromiseState.h
deleted file mode 100644
index 7e84191..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/fallback/PromiseState.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_fallback_PromiseState
-#define INCLUDED_thenshim_fallback_PromiseState
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(thenshim,fallback,PromiseState)
-namespace thenshim{
-namespace fallback{
-
-
-class PromiseState_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef PromiseState_obj OBJ_;
-
-	public:
-		PromiseState_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("thenshim.fallback.PromiseState",0a,45,f3,26); }
-		::String __ToString() const { return HX_("PromiseState.",d8,10,c1,ac) + _hx_tag; }
-
-		static ::thenshim::fallback::PromiseState Fulfilled;
-		static inline ::thenshim::fallback::PromiseState Fulfilled_dyn() { return Fulfilled; }
-		static ::thenshim::fallback::PromiseState Pending;
-		static inline ::thenshim::fallback::PromiseState Pending_dyn() { return Pending; }
-		static ::thenshim::fallback::PromiseState Rejected;
-		static inline ::thenshim::fallback::PromiseState Rejected_dyn() { return Rejected; }
-};
-
-} // end namespace thenshim
-} // end namespace fallback
-
-#endif /* INCLUDED_thenshim_fallback_PromiseState */ 
diff --git a/Sources/c_snikket/iinclude/include/thenshim/fallback/TaskScheduler.h b/Sources/c_snikket/iinclude/include/thenshim/fallback/TaskScheduler.h
deleted file mode 100644
index ba47ed8..0000000
--- a/Sources/c_snikket/iinclude/include/thenshim/fallback/TaskScheduler.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_thenshim_fallback_TaskScheduler
-#define INCLUDED_thenshim_fallback_TaskScheduler
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_8fc69505e32be3f2_11_new)
-HX_DECLARE_CLASS2(thenshim,fallback,TaskScheduler)
-
-namespace thenshim{
-namespace fallback{
-
-
-class HXCPP_CLASS_ATTRIBUTES TaskScheduler_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef TaskScheduler_obj OBJ_;
-		TaskScheduler_obj();
-
-	public:
-		enum { _hx_ClassId = 0x23747a3a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="thenshim.fallback.TaskScheduler")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"thenshim.fallback.TaskScheduler"); }
-
-		inline static ::hx::ObjectPtr< TaskScheduler_obj > __new() {
-			::hx::ObjectPtr< TaskScheduler_obj > __this = new TaskScheduler_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< TaskScheduler_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			TaskScheduler_obj *__this = (TaskScheduler_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(TaskScheduler_obj), true, "thenshim.fallback.TaskScheduler"));
-			*(void **)__this = TaskScheduler_obj::_hx_vtable;
-			thenshim::fallback::TaskScheduler_obj::__alloc_dynamic_functions(_hx_ctx,__this);
-{
-            	HX_STACKFRAME(&_hx_pos_8fc69505e32be3f2_11_new)
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		static void __alloc_dynamic_functions(::hx::Ctx *_hx_alloc,TaskScheduler_obj *_hx_obj);
-		//~TaskScheduler_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("TaskScheduler",16,22,01,bb); }
-
-		::Dynamic addNext;
-		inline ::Dynamic &addNext_dyn() {return addNext; }
-
-};
-
-} // end namespace thenshim
-} // end namespace fallback
-
-#endif /* INCLUDED_thenshim_fallback_TaskScheduler */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/_Chunk/Chunk_Impl_.h b/Sources/c_snikket/iinclude/include/tink/_Chunk/Chunk_Impl_.h
deleted file mode 100644
index 567282c..0000000
--- a/Sources/c_snikket/iinclude/include/tink/_Chunk/Chunk_Impl_.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink__Chunk_Chunk_Impl_
-#define INCLUDED_tink__Chunk_Chunk_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,_Chunk,Chunk_Impl_)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-
-namespace tink{
-namespace _Chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES Chunk_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Chunk_Impl__obj OBJ_;
-		Chunk_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x3bb70ded };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink._Chunk.Chunk_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink._Chunk.Chunk_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Chunk_Impl__obj > __new() {
-			::hx::ObjectPtr< Chunk_Impl__obj > __this = new Chunk_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Chunk_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Chunk_Impl__obj *__this = (Chunk_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Chunk_Impl__obj), false, "tink._Chunk.Chunk_Impl_"));
-			*(void **)__this = Chunk_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Chunk_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Chunk_Impl_",ad,aa,7a,82); }
-
-		static void __boot();
-		static ::Dynamic concat(::Dynamic this1,::Dynamic that);
-		static ::Dynamic concat_dyn();
-
-		static ::Dynamic join(::Array< ::Dynamic> chunks);
-		static ::Dynamic join_dyn();
-
-		static ::Dynamic EMPTY;
-};
-
-} // end namespace tink
-} // end namespace _Chunk
-
-#endif /* INCLUDED_tink__Chunk_Chunk_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/_Chunk/EmptyChunk.h b/Sources/c_snikket/iinclude/include/tink/_Chunk/EmptyChunk.h
deleted file mode 100644
index b66b362..0000000
--- a/Sources/c_snikket/iinclude/include/tink/_Chunk/EmptyChunk.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink__Chunk_EmptyChunk
-#define INCLUDED_tink__Chunk_EmptyChunk
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_chunk_ChunkBase
-#include <tink/chunk/ChunkBase.h>
-#endif
-#ifndef INCLUDED_tink_chunk_ChunkObject
-#include <tink/chunk/ChunkObject.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(tink,_Chunk,EmptyChunk)
-HX_DECLARE_CLASS2(tink,chunk,ChunkBase)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-
-namespace tink{
-namespace _Chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES EmptyChunk_obj : public  ::tink::chunk::ChunkBase_obj
-{
-	public:
-		typedef  ::tink::chunk::ChunkBase_obj super;
-		typedef EmptyChunk_obj OBJ_;
-		EmptyChunk_obj();
-
-	public:
-		enum { _hx_ClassId = 0x01566580 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink._Chunk.EmptyChunk")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink._Chunk.EmptyChunk"); }
-		static ::hx::ObjectPtr< EmptyChunk_obj > __new();
-		static ::hx::ObjectPtr< EmptyChunk_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EmptyChunk_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("EmptyChunk",c0,a0,c6,bc); }
-
-		static void __boot();
-		static  ::haxe::io::Bytes EMPTY;
-		int getLength();
-		::Dynamic getLength_dyn();
-
-		::Dynamic slice(int from,int to);
-		::Dynamic slice_dyn();
-
-		void blitTo( ::haxe::io::Bytes target,int offset);
-		::Dynamic blitTo_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-		 ::haxe::io::Bytes toBytes();
-		::Dynamic toBytes_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace _Chunk
-
-#endif /* INCLUDED_tink__Chunk_EmptyChunk */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/_Url/Url_Impl_.h b/Sources/c_snikket/iinclude/include/tink/_Url/Url_Impl_.h
deleted file mode 100644
index 954edfb..0000000
--- a/Sources/c_snikket/iinclude/include/tink/_Url/Url_Impl_.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink__Url_Url_Impl_
-#define INCLUDED_tink__Url_Url_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,_Url,Url_Impl_)
-
-namespace tink{
-namespace _Url{
-
-
-class HXCPP_CLASS_ATTRIBUTES Url_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Url_Impl__obj OBJ_;
-		Url_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x142a69a5 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink._Url.Url_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink._Url.Url_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Url_Impl__obj > __new() {
-			::hx::ObjectPtr< Url_Impl__obj > __this = new Url_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Url_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Url_Impl__obj *__this = (Url_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Url_Impl__obj), false, "tink._Url.Url_Impl_"));
-			*(void **)__this = Url_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Url_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Url_Impl_",2f,05,36,5a); }
-
-		static  ::Dynamic resolve( ::Dynamic this1, ::Dynamic that);
-		static ::Dynamic resolve_dyn();
-
-		static void makePayload( ::Dynamic parts);
-		static ::Dynamic makePayload_dyn();
-
-		static ::String toString( ::Dynamic this1);
-		static ::Dynamic toString_dyn();
-
-		static  ::Dynamic fromString(::String s);
-		static ::Dynamic fromString_dyn();
-
-		static void noop(::String _);
-		static ::Dynamic noop_dyn();
-
-		static  ::Dynamic parse(::String s, ::Dynamic onError);
-		static ::Dynamic parse_dyn();
-
-		static  ::Dynamic make( ::Dynamic parts);
-		static ::Dynamic make_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace _Url
-
-#endif /* INCLUDED_tink__Url_Url_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/chunk/ByteChunk.h b/Sources/c_snikket/iinclude/include/tink/chunk/ByteChunk.h
deleted file mode 100644
index 6fa0b79..0000000
--- a/Sources/c_snikket/iinclude/include/tink/chunk/ByteChunk.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_chunk_ByteChunk
-#define INCLUDED_tink_chunk_ByteChunk
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_chunk_ChunkBase
-#include <tink/chunk/ChunkBase.h>
-#endif
-#ifndef INCLUDED_tink_chunk_ChunkObject
-#include <tink/chunk/ChunkObject.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(tink,chunk,ByteChunk)
-HX_DECLARE_CLASS2(tink,chunk,ChunkBase)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-
-namespace tink{
-namespace chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES ByteChunk_obj : public  ::tink::chunk::ChunkBase_obj
-{
-	public:
-		typedef  ::tink::chunk::ChunkBase_obj super;
-		typedef ByteChunk_obj OBJ_;
-		ByteChunk_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1854896e };
-
-		void __construct(::Array< unsigned char > data,int from,int to);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.chunk.ByteChunk")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.chunk.ByteChunk"); }
-		static ::hx::ObjectPtr< ByteChunk_obj > __new(::Array< unsigned char > data,int from,int to);
-		static ::hx::ObjectPtr< ByteChunk_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< unsigned char > data,int from,int to);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ByteChunk_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("ByteChunk",25,7a,ca,7d); }
-
-		static ::Dynamic of( ::haxe::io::Bytes b);
-		static ::Dynamic of_dyn();
-
-		::Array< unsigned char > data;
-		int from;
-		int to;
-		 ::haxe::io::Bytes wrapped;
-		void flatten(::Array< ::Dynamic> into);
-
-		int getLength();
-		::Dynamic getLength_dyn();
-
-		 ::tink::chunk::ByteChunk getSlice(int from,int to);
-		::Dynamic getSlice_dyn();
-
-		::Dynamic slice(int from,int to);
-		::Dynamic slice_dyn();
-
-		void blitTo( ::haxe::io::Bytes target,int offset);
-		::Dynamic blitTo_dyn();
-
-		 ::haxe::io::Bytes toBytes();
-		::Dynamic toBytes_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace chunk
-
-#endif /* INCLUDED_tink_chunk_ByteChunk */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/chunk/ChunkBase.h b/Sources/c_snikket/iinclude/include/tink/chunk/ChunkBase.h
deleted file mode 100644
index f4af2f3..0000000
--- a/Sources/c_snikket/iinclude/include/tink/chunk/ChunkBase.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_chunk_ChunkBase
-#define INCLUDED_tink_chunk_ChunkBase
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,chunk,ByteChunk)
-HX_DECLARE_CLASS2(tink,chunk,ChunkBase)
-HX_DECLARE_CLASS2(tink,chunk,ChunkCursor)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-
-namespace tink{
-namespace chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES ChunkBase_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ChunkBase_obj OBJ_;
-		ChunkBase_obj();
-
-	public:
-		enum { _hx_ClassId = 0x49bef7e3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.chunk.ChunkBase")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.chunk.ChunkBase"); }
-
-		inline static ::hx::ObjectPtr< ChunkBase_obj > __new() {
-			::hx::ObjectPtr< ChunkBase_obj > __this = new ChunkBase_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< ChunkBase_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			ChunkBase_obj *__this = (ChunkBase_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ChunkBase_obj), true, "tink.chunk.ChunkBase"));
-			*(void **)__this = ChunkBase_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ChunkBase_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ChunkBase",fe,f4,07,36); }
-
-		::Array< ::Dynamic> flattened;
-		 ::tink::chunk::ChunkCursor getCursor();
-		::Dynamic getCursor_dyn();
-
-		virtual void flatten(::Array< ::Dynamic> into);
-		::Dynamic flatten_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace chunk
-
-#endif /* INCLUDED_tink_chunk_ChunkBase */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/chunk/ChunkCursor.h b/Sources/c_snikket/iinclude/include/tink/chunk/ChunkCursor.h
deleted file mode 100644
index 338a1b0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/chunk/ChunkCursor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_chunk_ChunkCursor
-#define INCLUDED_tink_chunk_ChunkCursor
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,chunk,ByteChunk)
-HX_DECLARE_CLASS2(tink,chunk,ChunkBase)
-HX_DECLARE_CLASS2(tink,chunk,ChunkCursor)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-
-namespace tink{
-namespace chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES ChunkCursor_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ChunkCursor_obj OBJ_;
-		ChunkCursor_obj();
-
-	public:
-		enum { _hx_ClassId = 0x5b17b728 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.chunk.ChunkCursor")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.chunk.ChunkCursor"); }
-		static ::hx::ObjectPtr< ChunkCursor_obj > __new();
-		static ::hx::ObjectPtr< ChunkCursor_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ChunkCursor_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ChunkCursor",03,71,6e,a9); }
-
-		static  ::tink::chunk::ChunkCursor create(::Array< ::Dynamic> parts);
-		static ::Dynamic create_dyn();
-
-		::Array< ::Dynamic> parts;
-		 ::tink::chunk::ByteChunk curPart;
-		int curPartIndex;
-		int curOffset;
-		int curLength;
-		int length;
-		int currentPos;
-		int currentByte;
-		void reset();
-		::Dynamic reset_dyn();
-
-		::Dynamic flush();
-		::Dynamic flush_dyn();
-
-		void add(::Dynamic chunk);
-		::Dynamic add_dyn();
-
-		void shift(::Dynamic chunk);
-		::Dynamic shift_dyn();
-
-		::Dynamic left();
-		::Dynamic left_dyn();
-
-		::Dynamic right();
-		::Dynamic right_dyn();
-
-		void ffwd();
-		::Dynamic ffwd_dyn();
-
-		bool next();
-		::Dynamic next_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace chunk
-
-#endif /* INCLUDED_tink_chunk_ChunkCursor */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/chunk/ChunkObject.h b/Sources/c_snikket/iinclude/include/tink/chunk/ChunkObject.h
deleted file mode 100644
index 7a4d920..0000000
--- a/Sources/c_snikket/iinclude/include/tink/chunk/ChunkObject.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_chunk_ChunkObject
-#define INCLUDED_tink_chunk_ChunkObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(tink,chunk,ByteChunk)
-HX_DECLARE_CLASS2(tink,chunk,ChunkBase)
-HX_DECLARE_CLASS2(tink,chunk,ChunkCursor)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-
-namespace tink{
-namespace chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES ChunkObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::tink::chunk::ChunkCursor (::hx::Object :: *_hx_getCursor)(); 
-		static inline  ::tink::chunk::ChunkCursor getCursor( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_getCursor)();
-		}
-		void (::hx::Object :: *_hx_flatten)(::Array< ::Dynamic> into); 
-		static inline void flatten( ::Dynamic _hx_,::Array< ::Dynamic> into) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_flatten)(into);
-		}
-		int (::hx::Object :: *_hx_getLength)(); 
-		static inline int getLength( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_getLength)();
-		}
-		::Dynamic (::hx::Object :: *_hx_slice)(int from,int to); 
-		static inline ::Dynamic slice( ::Dynamic _hx_,int from,int to) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_slice)(from,to);
-		}
-		::String (::hx::Object :: *_hx_toString)(); 
-		static inline ::String toString( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_toString)();
-		}
-		 ::haxe::io::Bytes (::hx::Object :: *_hx_toBytes)(); 
-		static inline  ::haxe::io::Bytes toBytes( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_toBytes)();
-		}
-		void (::hx::Object :: *_hx_blitTo)( ::haxe::io::Bytes target,int offset); 
-		static inline void blitTo( ::Dynamic _hx_, ::haxe::io::Bytes target,int offset) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::tink::chunk::ChunkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x027c3451)))->_hx_blitTo)(target,offset);
-		}
-};
-
-} // end namespace tink
-} // end namespace chunk
-
-#endif /* INCLUDED_tink_chunk_ChunkObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/chunk/CompoundChunk.h b/Sources/c_snikket/iinclude/include/tink/chunk/CompoundChunk.h
deleted file mode 100644
index 661f924..0000000
--- a/Sources/c_snikket/iinclude/include/tink/chunk/CompoundChunk.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_chunk_CompoundChunk
-#define INCLUDED_tink_chunk_CompoundChunk
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_chunk_ChunkBase
-#include <tink/chunk/ChunkBase.h>
-#endif
-#ifndef INCLUDED_tink_chunk_ChunkObject
-#include <tink/chunk/ChunkObject.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(tink,chunk,ByteChunk)
-HX_DECLARE_CLASS2(tink,chunk,ChunkBase)
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-HX_DECLARE_CLASS2(tink,chunk,CompoundChunk)
-
-namespace tink{
-namespace chunk{
-
-
-class HXCPP_CLASS_ATTRIBUTES CompoundChunk_obj : public  ::tink::chunk::ChunkBase_obj
-{
-	public:
-		typedef  ::tink::chunk::ChunkBase_obj super;
-		typedef CompoundChunk_obj OBJ_;
-		CompoundChunk_obj();
-
-	public:
-		enum { _hx_ClassId = 0x73605847 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.chunk.CompoundChunk")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.chunk.CompoundChunk"); }
-		static ::hx::ObjectPtr< CompoundChunk_obj > __new();
-		static ::hx::ObjectPtr< CompoundChunk_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~CompoundChunk_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("CompoundChunk",e2,7e,3d,10); }
-
-		static  ::tink::chunk::CompoundChunk asCompound(::Dynamic c);
-		static ::Dynamic asCompound_dyn();
-
-		static ::Dynamic cons(::Dynamic a,::Dynamic b);
-		static ::Dynamic cons_dyn();
-
-		static  ::tink::chunk::CompoundChunk create(::Array< ::Dynamic> chunks,int depth);
-		static ::Dynamic create_dyn();
-
-		::Array< ::Dynamic> chunks;
-		::Array< int > offsets;
-		int length;
-		int depth;
-		int getLength();
-		::Dynamic getLength_dyn();
-
-		int findChunk(int target);
-		::Dynamic findChunk_dyn();
-
-		void flatten(::Array< ::Dynamic> into);
-
-		::Dynamic slice(int from,int to);
-		::Dynamic slice_dyn();
-
-		void blitTo( ::haxe::io::Bytes target,int offset);
-		::Dynamic blitTo_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-		 ::haxe::io::Bytes toBytes();
-		::Dynamic toBytes_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace chunk
-
-#endif /* INCLUDED_tink_chunk_CompoundChunk */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/CallbackLinkRef.h b/Sources/c_snikket/iinclude/include/tink/core/CallbackLinkRef.h
deleted file mode 100644
index fb645e0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/CallbackLinkRef.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_CallbackLinkRef
-#define INCLUDED_tink_core_CallbackLinkRef
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_LinkObject
-#include <tink/core/LinkObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,CallbackLinkRef)
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES CallbackLinkRef_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef CallbackLinkRef_obj OBJ_;
-		CallbackLinkRef_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2af492e3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core.CallbackLinkRef")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core.CallbackLinkRef"); }
-		static ::hx::ObjectPtr< CallbackLinkRef_obj > __new();
-		static ::hx::ObjectPtr< CallbackLinkRef_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~CallbackLinkRef_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("CallbackLinkRef",14,ba,30,89); }
-
-		::Dynamic link;
-		void cancel();
-		::Dynamic cancel_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_CallbackLinkRef */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/CallbackList.h b/Sources/c_snikket/iinclude/include/tink/core/CallbackList.h
deleted file mode 100644
index 903c88f..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/CallbackList.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_CallbackList
-#define INCLUDED_tink_core_CallbackList
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_SimpleDisposable
-#include <tink/core/SimpleDisposable.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,CallbackList)
-HX_DECLARE_CLASS2(tink,core,Disposable)
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-HX_DECLARE_CLASS2(tink,core,OwnedDisposable)
-HX_DECLARE_CLASS2(tink,core,SimpleDisposable)
-HX_DECLARE_CLASS3(tink,core,_Callback,ListCell)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES CallbackList_obj : public  ::tink::core::SimpleDisposable_obj
-{
-	public:
-		typedef  ::tink::core::SimpleDisposable_obj super;
-		typedef CallbackList_obj OBJ_;
-		CallbackList_obj();
-
-	public:
-		enum { _hx_ClassId = 0x12a8ef7c };
-
-		void __construct(::hx::Null< bool >  __o_destructive);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core.CallbackList")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core.CallbackList"); }
-		static ::hx::ObjectPtr< CallbackList_obj > __new(::hx::Null< bool >  __o_destructive);
-		static ::hx::ObjectPtr< CallbackList_obj > __alloc(::hx::Ctx *_hx_ctx,::hx::Null< bool >  __o_destructive);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~CallbackList_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("CallbackList",e3,f4,55,31); }
-
-		bool destructive;
-		::Array< ::Dynamic> cells;
-		int used;
-		::Array< ::Dynamic> queue;
-		bool busy;
-		 ::Dynamic ondrain;
-		Dynamic ondrain_dyn() { return ondrain;}
-		 ::Dynamic onfill;
-		Dynamic onfill_dyn() { return onfill;}
-		void destroy();
-		::Dynamic destroy_dyn();
-
-		void invoke( ::Dynamic data);
-		::Dynamic invoke_dyn();
-
-		void compact();
-		::Dynamic compact_dyn();
-
-		void resize(int length);
-		::Dynamic resize_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_CallbackList */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/Disposable.h b/Sources/c_snikket/iinclude/include/tink/core/Disposable.h
deleted file mode 100644
index bd2c459..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/Disposable.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_Disposable
-#define INCLUDED_tink_core_Disposable
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,Disposable)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES Disposable_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_Disposable */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/FutureStatus.h b/Sources/c_snikket/iinclude/include/tink/core/FutureStatus.h
deleted file mode 100644
index f046dc9..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/FutureStatus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_FutureStatus
-#define INCLUDED_tink_core_FutureStatus
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,FutureStatus)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-namespace tink{
-namespace core{
-
-
-class FutureStatus_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef FutureStatus_obj OBJ_;
-
-	public:
-		FutureStatus_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.core.FutureStatus",e8,d1,b4,f2); }
-		::String __ToString() const { return HX_("FutureStatus.",99,22,18,ea) + _hx_tag; }
-
-		static ::tink::core::FutureStatus Awaited;
-		static inline ::tink::core::FutureStatus Awaited_dyn() { return Awaited; }
-		static ::tink::core::FutureStatus EagerlyAwaited;
-		static inline ::tink::core::FutureStatus EagerlyAwaited_dyn() { return EagerlyAwaited; }
-		static ::tink::core::FutureStatus NeverEver;
-		static inline ::tink::core::FutureStatus NeverEver_dyn() { return NeverEver; }
-		static ::tink::core::FutureStatus Ready(::Dynamic result);
-		static ::Dynamic Ready_dyn();
-		static ::tink::core::FutureStatus Suspended;
-		static inline ::tink::core::FutureStatus Suspended_dyn() { return Suspended; }
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_FutureStatus */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/LinkObject.h b/Sources/c_snikket/iinclude/include/tink/core/LinkObject.h
deleted file mode 100644
index 8ad85f0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/LinkObject.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_LinkObject
-#define INCLUDED_tink_core_LinkObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES LinkObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		void (::hx::Object :: *_hx_cancel)(); 
-		static inline void cancel( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::LinkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x0d15dd4a)))->_hx_cancel)();
-		}
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_LinkObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/MPair.h b/Sources/c_snikket/iinclude/include/tink/core/MPair.h
deleted file mode 100644
index 5d16a2e..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/MPair.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_MPair
-#define INCLUDED_tink_core_MPair
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_7fda083185addcb6_27_new)
-HX_DECLARE_CLASS2(tink,core,MPair)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES MPair_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef MPair_obj OBJ_;
-		MPair_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4cad4316 };
-
-		void __construct( ::Dynamic a, ::Dynamic b);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core.MPair")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core.MPair"); }
-
-		inline static ::hx::ObjectPtr< MPair_obj > __new( ::Dynamic a, ::Dynamic b) {
-			::hx::ObjectPtr< MPair_obj > __this = new MPair_obj();
-			__this->__construct(a,b);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< MPair_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic a, ::Dynamic b) {
-			MPair_obj *__this = (MPair_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(MPair_obj), true, "tink.core.MPair"));
-			*(void **)__this = MPair_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_7fda083185addcb6_27_new)
-HXLINE(  28)		( ( ::tink::core::MPair)(__this) )->a = a;
-HXLINE(  29)		( ( ::tink::core::MPair)(__this) )->b = b;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~MPair_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("MPair",07,b3,05,8b); }
-
-		 ::Dynamic a;
-		 ::Dynamic b;
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_MPair */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/NamedWith.h b/Sources/c_snikket/iinclude/include/tink/core/NamedWith.h
deleted file mode 100644
index 125a8dd..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/NamedWith.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_NamedWith
-#define INCLUDED_tink_core_NamedWith
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_fe49a69a0def38bb_11_new)
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES NamedWith_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef NamedWith_obj OBJ_;
-		NamedWith_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4df025ce };
-
-		void __construct( ::Dynamic name, ::Dynamic value);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core.NamedWith")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core.NamedWith"); }
-
-		inline static ::hx::ObjectPtr< NamedWith_obj > __new( ::Dynamic name, ::Dynamic value) {
-			::hx::ObjectPtr< NamedWith_obj > __this = new NamedWith_obj();
-			__this->__construct(name,value);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< NamedWith_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic name, ::Dynamic value) {
-			NamedWith_obj *__this = (NamedWith_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(NamedWith_obj), true, "tink.core.NamedWith"));
-			*(void **)__this = NamedWith_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_fe49a69a0def38bb_11_new)
-HXLINE(  12)		( ( ::tink::core::NamedWith)(__this) )->name = name;
-HXLINE(  13)		( ( ::tink::core::NamedWith)(__this) )->value = value;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~NamedWith_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("NamedWith",3f,e2,3d,d6); }
-
-		 ::Dynamic name;
-		 ::Dynamic value;
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_NamedWith */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/Outcome.h b/Sources/c_snikket/iinclude/include/tink/core/Outcome.h
deleted file mode 100644
index 8434633..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/Outcome.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_Outcome
-#define INCLUDED_tink_core_Outcome
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,Outcome)
-namespace tink{
-namespace core{
-
-
-class Outcome_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Outcome_obj OBJ_;
-
-	public:
-		Outcome_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.core.Outcome",5f,27,74,0c); }
-		::String __ToString() const { return HX_("Outcome.",7c,83,a3,53) + _hx_tag; }
-
-		static ::tink::core::Outcome Failure( ::Dynamic failure);
-		static ::Dynamic Failure_dyn();
-		static ::tink::core::Outcome Success( ::Dynamic data);
-		static ::Dynamic Success_dyn();
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_Outcome */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/OwnedDisposable.h b/Sources/c_snikket/iinclude/include/tink/core/OwnedDisposable.h
deleted file mode 100644
index fe901cf..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/OwnedDisposable.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_OwnedDisposable
-#define INCLUDED_tink_core_OwnedDisposable
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_Disposable
-#include <tink/core/Disposable.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,Disposable)
-HX_DECLARE_CLASS2(tink,core,OwnedDisposable)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES OwnedDisposable_obj {
-	public:
-		typedef  ::tink::core::Disposable_obj super;
-		HX_DO_INTERFACE_RTTI;
-
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_OwnedDisposable */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/SimpleDisposable.h b/Sources/c_snikket/iinclude/include/tink/core/SimpleDisposable.h
deleted file mode 100644
index 0af4801..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/SimpleDisposable.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_SimpleDisposable
-#define INCLUDED_tink_core_SimpleDisposable
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_OwnedDisposable
-#include <tink/core/OwnedDisposable.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,Disposable)
-HX_DECLARE_CLASS2(tink,core,OwnedDisposable)
-HX_DECLARE_CLASS2(tink,core,SimpleDisposable)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES SimpleDisposable_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SimpleDisposable_obj OBJ_;
-		SimpleDisposable_obj();
-
-	public:
-		enum { _hx_ClassId = 0x11eb7047 };
-
-		void __construct( ::Dynamic dispose);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core.SimpleDisposable")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core.SimpleDisposable"); }
-		static ::hx::ObjectPtr< SimpleDisposable_obj > __new( ::Dynamic dispose);
-		static ::hx::ObjectPtr< SimpleDisposable_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic dispose);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SimpleDisposable_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("SimpleDisposable",92,24,4b,01); }
-
-		static void noop();
-		static ::Dynamic noop_dyn();
-
-		 ::Dynamic f;
-		Dynamic f_dyn() { return f;}
-		::Array< ::Dynamic> disposeHandlers;
-		void dispose();
-		::Dynamic dispose_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_SimpleDisposable */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/TypedError.h b/Sources/c_snikket/iinclude/include/tink/core/TypedError.h
deleted file mode 100644
index b359208..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/TypedError.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core_TypedError
-#define INCLUDED_tink_core_TypedError
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,StackItem)
-HX_DECLARE_CLASS2(tink,core,TypedError)
-
-namespace tink{
-namespace core{
-
-
-class HXCPP_CLASS_ATTRIBUTES TypedError_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef TypedError_obj OBJ_;
-		TypedError_obj();
-
-	public:
-		enum { _hx_ClassId = 0x07b6f513 };
-
-		void __construct( ::Dynamic __o_code,::String message, ::Dynamic pos);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core.TypedError")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core.TypedError"); }
-		static ::hx::ObjectPtr< TypedError_obj > __new( ::Dynamic __o_code,::String message, ::Dynamic pos);
-		static ::hx::ObjectPtr< TypedError_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic __o_code,::String message, ::Dynamic pos);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~TypedError_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("TypedError",1e,0f,9b,3c); }
-
-		static  ::tink::core::TypedError withData( ::Dynamic code,::String message, ::Dynamic data, ::Dynamic pos);
-		static ::Dynamic withData_dyn();
-
-		static  ::tink::core::TypedError typed( ::Dynamic code,::String message, ::Dynamic data, ::Dynamic pos);
-		static ::Dynamic typed_dyn();
-
-		::String message;
-		int code;
-		 ::Dynamic data;
-		 ::Dynamic pos;
-		::Array< ::Dynamic> callStack;
-		::Array< ::Dynamic> exceptionStack;
-		::String printPos();
-		::Dynamic printPos_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-
-#endif /* INCLUDED_tink_core_TypedError */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Callback/Callback_Impl_.h b/Sources/c_snikket/iinclude/include/tink/core/_Callback/Callback_Impl_.h
deleted file mode 100644
index a7f2a09..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Callback/Callback_Impl_.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Callback_Callback_Impl_
-#define INCLUDED_tink_core__Callback_Callback_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Callback,Callback_Impl_)
-
-namespace tink{
-namespace core{
-namespace _Callback{
-
-
-class HXCPP_CLASS_ATTRIBUTES Callback_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Callback_Impl__obj OBJ_;
-		Callback_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x10af39f4 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.core._Callback.Callback_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.core._Callback.Callback_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Callback_Impl__obj > __new() {
-			::hx::ObjectPtr< Callback_Impl__obj > __this = new Callback_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Callback_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Callback_Impl__obj *__this = (Callback_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Callback_Impl__obj), false, "tink.core._Callback.Callback_Impl_"));
-			*(void **)__this = Callback_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Callback_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Callback_Impl_",45,8c,62,d2); }
-
-		static void __boot();
-		static int depth;
-		static void invoke( ::Dynamic this1, ::Dynamic data);
-		static ::Dynamic invoke_dyn();
-
-		static void defer( ::Dynamic f);
-		static ::Dynamic defer_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Callback
-
-#endif /* INCLUDED_tink_core__Callback_Callback_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Callback/LinkPair.h b/Sources/c_snikket/iinclude/include/tink/core/_Callback/LinkPair.h
deleted file mode 100644
index b86caa5..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Callback/LinkPair.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Callback_LinkPair
-#define INCLUDED_tink_core__Callback_LinkPair
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_LinkObject
-#include <tink/core/LinkObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-HX_DECLARE_CLASS3(tink,core,_Callback,LinkPair)
-
-namespace tink{
-namespace core{
-namespace _Callback{
-
-
-class HXCPP_CLASS_ATTRIBUTES LinkPair_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef LinkPair_obj OBJ_;
-		LinkPair_obj();
-
-	public:
-		enum { _hx_ClassId = 0x01531ffb };
-
-		void __construct(::Dynamic a,::Dynamic b);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core._Callback.LinkPair")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core._Callback.LinkPair"); }
-		static ::hx::ObjectPtr< LinkPair_obj > __new(::Dynamic a,::Dynamic b);
-		static ::hx::ObjectPtr< LinkPair_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic a,::Dynamic b);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~LinkPair_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("LinkPair",54,61,94,d5); }
-
-		::Dynamic a;
-		::Dynamic b;
-		bool dissolved;
-		void cancel();
-		::Dynamic cancel_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Callback
-
-#endif /* INCLUDED_tink_core__Callback_LinkPair */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Callback/ListCell.h b/Sources/c_snikket/iinclude/include/tink/core/_Callback/ListCell.h
deleted file mode 100644
index 1e66518..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Callback/ListCell.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Callback_ListCell
-#define INCLUDED_tink_core__Callback_ListCell
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_LinkObject
-#include <tink/core/LinkObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,CallbackList)
-HX_DECLARE_CLASS2(tink,core,Disposable)
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-HX_DECLARE_CLASS2(tink,core,OwnedDisposable)
-HX_DECLARE_CLASS2(tink,core,SimpleDisposable)
-HX_DECLARE_CLASS3(tink,core,_Callback,ListCell)
-
-namespace tink{
-namespace core{
-namespace _Callback{
-
-
-class HXCPP_CLASS_ATTRIBUTES ListCell_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef ListCell_obj OBJ_;
-		ListCell_obj();
-
-	public:
-		enum { _hx_ClassId = 0x05a024cb };
-
-		void __construct( ::Dynamic cb, ::tink::core::CallbackList list);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core._Callback.ListCell")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core._Callback.ListCell"); }
-		static ::hx::ObjectPtr< ListCell_obj > __new( ::Dynamic cb, ::tink::core::CallbackList list);
-		static ::hx::ObjectPtr< ListCell_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic cb, ::tink::core::CallbackList list);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ListCell_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("ListCell",40,ad,63,fb); }
-
-		 ::Dynamic cb;
-		Dynamic cb_dyn() { return cb;}
-		 ::tink::core::CallbackList list;
-		void cancel();
-		::Dynamic cancel_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Callback
-
-#endif /* INCLUDED_tink_core__Callback_ListCell */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Future/FutureObject.h b/Sources/c_snikket/iinclude/include/tink/core/_Future/FutureObject.h
deleted file mode 100644
index 7e4ed1a..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Future/FutureObject.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Future_FutureObject
-#define INCLUDED_tink_core__Future_FutureObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,FutureStatus)
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-
-namespace tink{
-namespace core{
-namespace _Future{
-
-
-class HXCPP_CLASS_ATTRIBUTES FutureObject_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef FutureObject_obj OBJ_;
-		FutureObject_obj();
-
-	public:
-		enum { _hx_ClassId = 0x75d0f9d3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.core._Future.FutureObject")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.core._Future.FutureObject"); }
-		static ::hx::ObjectPtr< FutureObject_obj > __new();
-		static ::hx::ObjectPtr< FutureObject_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FutureObject_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("FutureObject",82,eb,54,94); }
-
-		virtual  ::tink::core::FutureStatus getStatus();
-		::Dynamic getStatus_dyn();
-
-		virtual ::Dynamic handle( ::Dynamic callback);
-		::Dynamic handle_dyn();
-
-		virtual void eager();
-		::Dynamic eager_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Future
-
-#endif /* INCLUDED_tink_core__Future_FutureObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Future/Future_Impl_.h b/Sources/c_snikket/iinclude/include/tink/core/_Future/Future_Impl_.h
deleted file mode 100644
index 94ba4b7..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Future/Future_Impl_.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Future_Future_Impl_
-#define INCLUDED_tink_core__Future_Future_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Future,Future_Impl_)
-
-namespace tink{
-namespace core{
-namespace _Future{
-
-
-class HXCPP_CLASS_ATTRIBUTES Future_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Future_Impl__obj OBJ_;
-		Future_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x78864394 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.core._Future.Future_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.core._Future.Future_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Future_Impl__obj > __new() {
-			::hx::ObjectPtr< Future_Impl__obj > __this = new Future_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Future_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Future_Impl__obj *__this = (Future_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Future_Impl__obj), false, "tink.core._Future.Future_Impl_"));
-			*(void **)__this = Future_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Future_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Future_Impl_",43,35,0a,97); }
-
-		static void __boot();
-		static  ::tink::core::_Future::FutureObject NEVER_INST;
-		static  ::tink::core::_Future::FutureObject never();
-		static ::Dynamic never_dyn();
-
-		static  ::tink::core::_Future::FutureObject map( ::tink::core::_Future::FutureObject this1, ::Dynamic f, ::Dynamic gather);
-		static ::Dynamic map_dyn();
-
-		static  ::tink::core::_Future::FutureObject flatMap( ::tink::core::_Future::FutureObject this1, ::Dynamic next, ::Dynamic gather);
-		static ::Dynamic flatMap_dyn();
-
-		static  ::tink::core::_Future::FutureObject async( ::Dynamic init, ::Dynamic lazy);
-		static ::Dynamic async_dyn();
-
-		static  ::tink::core::_Future::FutureObject irreversible( ::Dynamic init);
-		static ::Dynamic irreversible_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Future
-
-#endif /* INCLUDED_tink_core__Future_Future_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Future/SuspendableFuture.h b/Sources/c_snikket/iinclude/include/tink/core/_Future/SuspendableFuture.h
deleted file mode 100644
index 358a37e..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Future/SuspendableFuture.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Future_SuspendableFuture
-#define INCLUDED_tink_core__Future_SuspendableFuture
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core__Future_FutureObject
-#include <tink/core/_Future/FutureObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,CallbackList)
-HX_DECLARE_CLASS2(tink,core,Disposable)
-HX_DECLARE_CLASS2(tink,core,FutureStatus)
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-HX_DECLARE_CLASS2(tink,core,OwnedDisposable)
-HX_DECLARE_CLASS2(tink,core,SimpleDisposable)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Future,SuspendableFuture)
-
-namespace tink{
-namespace core{
-namespace _Future{
-
-
-class HXCPP_CLASS_ATTRIBUTES SuspendableFuture_obj : public  ::tink::core::_Future::FutureObject_obj
-{
-	public:
-		typedef  ::tink::core::_Future::FutureObject_obj super;
-		typedef SuspendableFuture_obj OBJ_;
-		SuspendableFuture_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1fbfb7e8 };
-
-		void __construct( ::Dynamic wakeup);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core._Future.SuspendableFuture")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core._Future.SuspendableFuture"); }
-		static ::hx::ObjectPtr< SuspendableFuture_obj > __new( ::Dynamic wakeup);
-		static ::hx::ObjectPtr< SuspendableFuture_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic wakeup);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SuspendableFuture_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SuspendableFuture",d9,4b,c6,80); }
-
-		 ::tink::core::CallbackList callbacks;
-		 ::tink::core::FutureStatus status;
-		::Dynamic link;
-		 ::Dynamic wakeup;
-		Dynamic wakeup_dyn() { return wakeup;}
-		 ::tink::core::FutureStatus getStatus();
-
-		void trigger( ::Dynamic value);
-		::Dynamic trigger_dyn();
-
-		::Dynamic handle( ::Dynamic callback);
-
-		void arm();
-		::Dynamic arm_dyn();
-
-		void eager();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Future
-
-#endif /* INCLUDED_tink_core__Future_SuspendableFuture */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Future/SyncFuture.h b/Sources/c_snikket/iinclude/include/tink/core/_Future/SyncFuture.h
deleted file mode 100644
index 7c3b0d3..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Future/SyncFuture.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Future_SyncFuture
-#define INCLUDED_tink_core__Future_SyncFuture
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core__Future_FutureObject
-#include <tink/core/_Future/FutureObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,FutureStatus)
-HX_DECLARE_CLASS2(tink,core,LinkObject)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Future,SyncFuture)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-
-namespace tink{
-namespace core{
-namespace _Future{
-
-
-class HXCPP_CLASS_ATTRIBUTES SyncFuture_obj : public  ::tink::core::_Future::FutureObject_obj
-{
-	public:
-		typedef  ::tink::core::_Future::FutureObject_obj super;
-		typedef SyncFuture_obj OBJ_;
-		SyncFuture_obj();
-
-	public:
-		enum { _hx_ClassId = 0x03763767 };
-
-		void __construct(::Dynamic value);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core._Future.SyncFuture")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core._Future.SyncFuture"); }
-		static ::hx::ObjectPtr< SyncFuture_obj > __new(::Dynamic value);
-		static ::hx::ObjectPtr< SyncFuture_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic value);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SyncFuture_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SyncFuture",1e,81,9c,5c); }
-
-		::Dynamic value;
-		 ::tink::core::FutureStatus getStatus();
-
-		::Dynamic handle( ::Dynamic cb);
-
-		void eager();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Future
-
-#endif /* INCLUDED_tink_core__Future_SyncFuture */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/Computable.h b/Sources/c_snikket/iinclude/include/tink/core/_Lazy/Computable.h
deleted file mode 100644
index 7d87bba..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/Computable.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Lazy_Computable
-#define INCLUDED_tink_core__Lazy_Computable
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-
-namespace tink{
-namespace core{
-namespace _Lazy{
-
-
-class HXCPP_CLASS_ATTRIBUTES Computable_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		bool (::hx::Object :: *_hx_isComputed)(); 
-		static inline bool isComputed( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::Computable_obj *>(_hx_.mPtr->_hx_getInterface(0xd2b592ea)))->_hx_isComputed)();
-		}
-		void (::hx::Object :: *_hx_compute)(); 
-		static inline void compute( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::Computable_obj *>(_hx_.mPtr->_hx_getInterface(0xd2b592ea)))->_hx_compute)();
-		}
-		::Dynamic (::hx::Object :: *_hx_underlying)(); 
-		static inline ::Dynamic underlying( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::Computable_obj *>(_hx_.mPtr->_hx_getInterface(0xd2b592ea)))->_hx_underlying)();
-		}
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Lazy
-
-#endif /* INCLUDED_tink_core__Lazy_Computable */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyConst.h b/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyConst.h
deleted file mode 100644
index 8313c7c..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyConst.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Lazy_LazyConst
-#define INCLUDED_tink_core__Lazy_LazyConst
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core__Lazy_LazyObject
-#include <tink/core/_Lazy/LazyObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyConst)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-
-namespace tink{
-namespace core{
-namespace _Lazy{
-
-
-class HXCPP_CLASS_ATTRIBUTES LazyConst_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef LazyConst_obj OBJ_;
-		LazyConst_obj();
-
-	public:
-		enum { _hx_ClassId = 0x43104c2d };
-
-		void __construct( ::Dynamic value);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core._Lazy.LazyConst")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core._Lazy.LazyConst"); }
-		static ::hx::ObjectPtr< LazyConst_obj > __new( ::Dynamic value);
-		static ::hx::ObjectPtr< LazyConst_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic value);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~LazyConst_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("LazyConst",2f,14,bd,5b); }
-
-		 ::Dynamic value;
-		bool isComputed();
-		::Dynamic isComputed_dyn();
-
-		 ::Dynamic get();
-		::Dynamic get_dyn();
-
-		void compute();
-		::Dynamic compute_dyn();
-
-		::Dynamic underlying();
-		::Dynamic underlying_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Lazy
-
-#endif /* INCLUDED_tink_core__Lazy_LazyConst */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyFunc.h b/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyFunc.h
deleted file mode 100644
index d20b1d8..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyFunc.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Lazy_LazyFunc
-#define INCLUDED_tink_core__Lazy_LazyFunc
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core__Lazy_LazyObject
-#include <tink/core/_Lazy/LazyObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyFunc)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-
-namespace tink{
-namespace core{
-namespace _Lazy{
-
-
-class HXCPP_CLASS_ATTRIBUTES LazyFunc_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef LazyFunc_obj OBJ_;
-		LazyFunc_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1cb47fba };
-
-		void __construct( ::Dynamic f,::Dynamic from);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.core._Lazy.LazyFunc")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.core._Lazy.LazyFunc"); }
-		static ::hx::ObjectPtr< LazyFunc_obj > __new( ::Dynamic f,::Dynamic from);
-		static ::hx::ObjectPtr< LazyFunc_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic f,::Dynamic from);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~LazyFunc_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("LazyFunc",f8,2d,40,5e); }
-
-		 ::Dynamic f;
-		Dynamic f_dyn() { return f;}
-		::Dynamic from;
-		 ::Dynamic result;
-		::Dynamic underlying();
-		::Dynamic underlying_dyn();
-
-		bool isComputed();
-		::Dynamic isComputed_dyn();
-
-		 ::Dynamic get();
-		::Dynamic get_dyn();
-
-		void compute();
-		::Dynamic compute_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Lazy
-
-#endif /* INCLUDED_tink_core__Lazy_LazyFunc */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyObject.h b/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyObject.h
deleted file mode 100644
index b6ab109..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/LazyObject.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Lazy_LazyObject
-#define INCLUDED_tink_core__Lazy_LazyObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core__Lazy_Computable
-#include <tink/core/_Lazy/Computable.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-
-namespace tink{
-namespace core{
-namespace _Lazy{
-
-
-class HXCPP_CLASS_ATTRIBUTES LazyObject_obj {
-	public:
-		typedef  ::tink::core::_Lazy::Computable_obj super;
-		HX_DO_INTERFACE_RTTI;
-
-		bool (::hx::Object :: *_hx_isComputed)(); 
-		static inline bool isComputed( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::LazyObject_obj *>(_hx_.mPtr->_hx_getInterface(0xe1200775)))->_hx_isComputed)();
-		}
-		void (::hx::Object :: *_hx_compute)(); 
-		static inline void compute( ::Dynamic _hx_) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::LazyObject_obj *>(_hx_.mPtr->_hx_getInterface(0xe1200775)))->_hx_compute)();
-		}
-		::Dynamic (::hx::Object :: *_hx_underlying)(); 
-		static inline ::Dynamic underlying( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::LazyObject_obj *>(_hx_.mPtr->_hx_getInterface(0xe1200775)))->_hx_underlying)();
-		}
-		 ::Dynamic (::hx::Object :: *_hx_get)(); 
-		static inline  ::Dynamic get( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::core::_Lazy::LazyObject_obj *>(_hx_.mPtr->_hx_getInterface(0xe1200775)))->_hx_get)();
-		}
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Lazy
-
-#endif /* INCLUDED_tink_core__Lazy_LazyObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/Lazy_Impl_.h b/Sources/c_snikket/iinclude/include/tink/core/_Lazy/Lazy_Impl_.h
deleted file mode 100644
index 46a8e46..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Lazy/Lazy_Impl_.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Lazy_Lazy_Impl_
-#define INCLUDED_tink_core__Lazy_Lazy_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Lazy_Impl_)
-
-namespace tink{
-namespace core{
-namespace _Lazy{
-
-
-class HXCPP_CLASS_ATTRIBUTES Lazy_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Lazy_Impl__obj OBJ_;
-		Lazy_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x7f55432a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.core._Lazy.Lazy_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.core._Lazy.Lazy_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Lazy_Impl__obj > __new() {
-			::hx::ObjectPtr< Lazy_Impl__obj > __this = new Lazy_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Lazy_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Lazy_Impl__obj *__this = (Lazy_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Lazy_Impl__obj), false, "tink.core._Lazy.Lazy_Impl_"));
-			*(void **)__this = Lazy_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Lazy_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Lazy_Impl_",34,20,cd,39); }
-
-		static  ::Dynamic get(::Dynamic this1);
-		static ::Dynamic get_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Lazy
-
-#endif /* INCLUDED_tink_core__Lazy_Lazy_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/core/_Promise/Promise_Impl_.h b/Sources/c_snikket/iinclude/include/tink/core/_Promise/Promise_Impl_.h
deleted file mode 100644
index 74f71a0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/core/_Promise/Promise_Impl_.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_core__Promise_Promise_Impl_
-#define INCLUDED_tink_core__Promise_Promise_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Promise,Promise_Impl_)
-
-namespace tink{
-namespace core{
-namespace _Promise{
-
-
-class HXCPP_CLASS_ATTRIBUTES Promise_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Promise_Impl__obj OBJ_;
-		Promise_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x03edc1ee };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.core._Promise.Promise_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.core._Promise.Promise_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Promise_Impl__obj > __new() {
-			::hx::ObjectPtr< Promise_Impl__obj > __this = new Promise_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Promise_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Promise_Impl__obj *__this = (Promise_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Promise_Impl__obj), false, "tink.core._Promise.Promise_Impl_"));
-			*(void **)__this = Promise_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Promise_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Promise_Impl_",5b,00,ba,be); }
-
-		static  ::tink::core::_Future::FutureObject next( ::tink::core::_Future::FutureObject this1, ::Dynamic f, ::Dynamic gather);
-		static ::Dynamic next_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace core
-} // end namespace _Promise
-
-#endif /* INCLUDED_tink_core__Promise_Promise_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/BodyPart.h b/Sources/c_snikket/iinclude/include/tink/http/BodyPart.h
deleted file mode 100644
index 29267c0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/BodyPart.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_BodyPart
-#define INCLUDED_tink_http_BodyPart
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,http,BodyPart)
-namespace tink{
-namespace http{
-
-
-class BodyPart_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef BodyPart_obj OBJ_;
-
-	public:
-		BodyPart_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.http.BodyPart",ff,9c,21,13); }
-		::String __ToString() const { return HX_("BodyPart.",b9,9a,30,1f) + _hx_tag; }
-
-		static ::tink::http::BodyPart File( ::Dynamic handle);
-		static ::Dynamic File_dyn();
-		static ::tink::http::BodyPart Value(::String v);
-		static ::Dynamic Value_dyn();
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_BodyPart */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/ClientObject.h b/Sources/c_snikket/iinclude/include/tink/http/ClientObject.h
deleted file mode 100644
index cfa81e2..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/ClientObject.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_ClientObject
-#define INCLUDED_tink_http_ClientObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES ClientObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::tink::core::_Future::FutureObject (::hx::Object :: *_hx_request)( ::tink::http::OutgoingRequest req); 
-		static inline  ::tink::core::_Future::FutureObject request( ::Dynamic _hx_, ::tink::http::OutgoingRequest req) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::http::ClientObject_obj *>(_hx_.mPtr->_hx_getInterface(0x9c46f484)))->_hx_request)(req);
-		}
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_ClientObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/ClientType.h b/Sources/c_snikket/iinclude/include/tink/http/ClientType.h
deleted file mode 100644
index 372ee0e..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/ClientType.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_ClientType
-#define INCLUDED_tink_http_ClientType
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,ClientType)
-HX_DECLARE_CLASS2(tink,http,Container)
-HX_DECLARE_CLASS3(tink,http,containers,LocalContainer)
-namespace tink{
-namespace http{
-
-
-class ClientType_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef ClientType_obj OBJ_;
-
-	public:
-		ClientType_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.http.ClientType",6f,ea,c8,55); }
-		::String __ToString() const { return HX_("ClientType.",c9,7d,23,dd) + _hx_tag; }
-
-		static ::tink::http::ClientType Curl;
-		static inline ::tink::http::ClientType Curl_dyn() { return Curl; }
-		static ::tink::http::ClientType Custom(::Dynamic v);
-		static ::Dynamic Custom_dyn();
-		static ::tink::http::ClientType Default;
-		static inline ::tink::http::ClientType Default_dyn() { return Default; }
-		static ::tink::http::ClientType Local( ::tink::http::containers::LocalContainer container);
-		static ::Dynamic Local_dyn();
-		static ::tink::http::ClientType StdLib;
-		static inline ::tink::http::ClientType StdLib_dyn() { return StdLib; }
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_ClientType */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/Container.h b/Sources/c_snikket/iinclude/include/tink/http/Container.h
deleted file mode 100644
index e6373c2..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/Container.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_Container
-#define INCLUDED_tink_http_Container
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,http,Container)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES Container_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_Container */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/Fetch.h b/Sources/c_snikket/iinclude/include/tink/http/Fetch.h
deleted file mode 100644
index b965ff4..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/Fetch.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_Fetch
-#define INCLUDED_tink_http_Fetch
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS1(haxe,IMap)
-HX_DECLARE_CLASS2(haxe,ds,BalancedTree)
-HX_DECLARE_CLASS2(haxe,ds,EnumValueMap)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,ClientType)
-HX_DECLARE_CLASS2(tink,http,Fetch)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES Fetch_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Fetch_obj OBJ_;
-		Fetch_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7f806d70 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.http.Fetch")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.http.Fetch"); }
-
-		inline static ::hx::ObjectPtr< Fetch_obj > __new() {
-			::hx::ObjectPtr< Fetch_obj > __this = new Fetch_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Fetch_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Fetch_obj *__this = (Fetch_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Fetch_obj), false, "tink.http.Fetch"));
-			*(void **)__this = Fetch_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Fetch_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Fetch",1a,84,27,91); }
-
-		static void __boot();
-		static  ::haxe::ds::EnumValueMap cache;
-		static  ::tink::core::_Future::FutureObject fetch( ::Dynamic url, ::Dynamic options);
-		static ::Dynamic fetch_dyn();
-
-		static ::Dynamic getClient( ::tink::http::ClientType type);
-		static ::Dynamic getClient_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_Fetch */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/HandlerObject.h b/Sources/c_snikket/iinclude/include/tink/http/HandlerObject.h
deleted file mode 100644
index 37c2119..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/HandlerObject.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_HandlerObject
-#define INCLUDED_tink_http_HandlerObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,HandlerObject)
-HX_DECLARE_CLASS2(tink,http,IncomingRequest)
-HX_DECLARE_CLASS2(tink,http,Message)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES HandlerObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::tink::core::_Future::FutureObject (::hx::Object :: *_hx_process)( ::tink::http::IncomingRequest req); 
-		static inline  ::tink::core::_Future::FutureObject process( ::Dynamic _hx_, ::tink::http::IncomingRequest req) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::http::HandlerObject_obj *>(_hx_.mPtr->_hx_getInterface(0xee501fcf)))->_hx_process)(req);
-		}
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_HandlerObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/Header.h b/Sources/c_snikket/iinclude/include/tink/http/Header.h
deleted file mode 100644
index 8567553..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/Header.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_Header
-#define INCLUDED_tink_http_Header
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,core,Outcome)
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES Header_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Header_obj OBJ_;
-		Header_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4094a9e7 };
-
-		void __construct(::Array< ::Dynamic> fields);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.Header")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.Header"); }
-		static ::hx::ObjectPtr< Header_obj > __new(::Array< ::Dynamic> fields);
-		static ::hx::ObjectPtr< Header_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< ::Dynamic> fields);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Header_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Header",ad,7d,94,31); }
-
-		::Array< ::Dynamic> fields;
-		::Array< ::String > get(::String name);
-		::Dynamic get_dyn();
-
-		 ::tink::core::Outcome byName(::String name);
-		::Dynamic byName_dyn();
-
-		 ::tink::core::Outcome getContentLength();
-		::Dynamic getContentLength_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_Header */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/HeaderField.h b/Sources/c_snikket/iinclude/include/tink/http/HeaderField.h
deleted file mode 100644
index c12456f..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/HeaderField.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_HeaderField
-#define INCLUDED_tink_http_HeaderField
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_core_NamedWith
-#include <tink/core/NamedWith.h>
-#endif
-HX_DECLARE_STACK_FRAME(_hx_pos_80f54cb31df217e8_249_new)
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES HeaderField_obj : public  ::tink::core::NamedWith_obj
-{
-	public:
-		typedef  ::tink::core::NamedWith_obj super;
-		typedef HeaderField_obj OBJ_;
-		HeaderField_obj();
-
-	public:
-		enum { _hx_ClassId = 0x67181553 };
-
-		void __construct(::String name,::String value);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.HeaderField")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.HeaderField"); }
-
-		inline static ::hx::ObjectPtr< HeaderField_obj > __new(::String name,::String value) {
-			::hx::ObjectPtr< HeaderField_obj > __this = new HeaderField_obj();
-			__this->__construct(name,value);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HeaderField_obj > __alloc(::hx::Ctx *_hx_ctx,::String name,::String value) {
-			HeaderField_obj *__this = (HeaderField_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HeaderField_obj), true, "tink.http.HeaderField"));
-			*(void **)__this = HeaderField_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_80f54cb31df217e8_249_new)
-HXDLIN( 249)		__this->super::__construct(name,value);
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HeaderField_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HeaderField",cd,d3,84,f1); }
-
-		static  ::tink::http::HeaderField ofString(::String s);
-		static ::Dynamic ofString_dyn();
-
-		virtual ::String toString();
-		::Dynamic toString_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_HeaderField */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/HeaderParser.h b/Sources/c_snikket/iinclude/include/tink/http/HeaderParser.h
deleted file mode 100644
index a493cba..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/HeaderParser.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_HeaderParser
-#define INCLUDED_tink_http_HeaderParser
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_io_BytewiseParser
-#include <tink/io/BytewiseParser.h>
-#endif
-HX_DECLARE_CLASS0(StringBuf)
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,core,Outcome)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-HX_DECLARE_CLASS2(tink,http,HeaderParser)
-HX_DECLARE_CLASS2(tink,io,BytewiseParser)
-HX_DECLARE_CLASS2(tink,io,ParseStep)
-HX_DECLARE_CLASS2(tink,io,StreamParserObject)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES HeaderParser_obj : public  ::tink::io::BytewiseParser_obj
-{
-	public:
-		typedef  ::tink::io::BytewiseParser_obj super;
-		typedef HeaderParser_obj OBJ_;
-		HeaderParser_obj();
-
-	public:
-		enum { _hx_ClassId = 0x3af4a226 };
-
-		void __construct( ::Dynamic makeHeader);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.HeaderParser")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.HeaderParser"); }
-		static ::hx::ObjectPtr< HeaderParser_obj > __new( ::Dynamic makeHeader);
-		static ::hx::ObjectPtr< HeaderParser_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic makeHeader);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HeaderParser_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HeaderParser",6c,8e,ae,cf); }
-
-		 ::Dynamic header;
-		::Array< ::Dynamic> fields;
-		 ::StringBuf buf;
-		int last;
-		 ::Dynamic makeHeader;
-		Dynamic makeHeader_dyn() { return makeHeader;}
-		 ::tink::io::ParseStep read(int c);
-
-		 ::tink::io::ParseStep nextLine();
-		::Dynamic nextLine_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_HeaderParser */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/IncomingRequest.h b/Sources/c_snikket/iinclude/include/tink/http/IncomingRequest.h
deleted file mode 100644
index 3bdc78d..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/IncomingRequest.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_IncomingRequest
-#define INCLUDED_tink_http_IncomingRequest
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Message
-#include <tink/http/Message.h>
-#endif
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,IncomingRequest)
-HX_DECLARE_CLASS2(tink,http,IncomingRequestBody)
-HX_DECLARE_CLASS2(tink,http,IncomingRequestHeader)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,RequestHeader)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES IncomingRequest_obj : public  ::tink::http::Message_obj
-{
-	public:
-		typedef  ::tink::http::Message_obj super;
-		typedef IncomingRequest_obj OBJ_;
-		IncomingRequest_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0386f7df };
-
-		void __construct(::String clientIp, ::tink::http::IncomingRequestHeader header, ::tink::http::IncomingRequestBody body);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.IncomingRequest")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.IncomingRequest"); }
-		static ::hx::ObjectPtr< IncomingRequest_obj > __new(::String clientIp, ::tink::http::IncomingRequestHeader header, ::tink::http::IncomingRequestBody body);
-		static ::hx::ObjectPtr< IncomingRequest_obj > __alloc(::hx::Ctx *_hx_ctx,::String clientIp, ::tink::http::IncomingRequestHeader header, ::tink::http::IncomingRequestBody body);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IncomingRequest_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IncomingRequest",e9,56,c7,13); }
-
-		::String clientIp;
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_IncomingRequest */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/IncomingRequestBody.h b/Sources/c_snikket/iinclude/include/tink/http/IncomingRequestBody.h
deleted file mode 100644
index 80b9e97..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/IncomingRequestBody.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_IncomingRequestBody
-#define INCLUDED_tink_http_IncomingRequestBody
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,http,IncomingRequestBody)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace http{
-
-
-class IncomingRequestBody_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef IncomingRequestBody_obj OBJ_;
-
-	public:
-		IncomingRequestBody_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.http.IncomingRequestBody",41,e5,fc,1f); }
-		::String __ToString() const { return HX_("IncomingRequestBody.",a3,3f,25,ff) + _hx_tag; }
-
-		static ::tink::http::IncomingRequestBody Parsed(::Array< ::Dynamic> parts);
-		static ::Dynamic Parsed_dyn();
-		static ::tink::http::IncomingRequestBody Plain(::Dynamic source);
-		static ::Dynamic Plain_dyn();
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_IncomingRequestBody */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/IncomingRequestHeader.h b/Sources/c_snikket/iinclude/include/tink/http/IncomingRequestHeader.h
deleted file mode 100644
index 8f6a9c0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/IncomingRequestHeader.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_IncomingRequestHeader
-#define INCLUDED_tink_http_IncomingRequestHeader
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_RequestHeader
-#include <tink/http/RequestHeader.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-HX_DECLARE_CLASS2(tink,http,IncomingRequestHeader)
-HX_DECLARE_CLASS2(tink,http,RequestHeader)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES IncomingRequestHeader_obj : public  ::tink::http::RequestHeader_obj
-{
-	public:
-		typedef  ::tink::http::RequestHeader_obj super;
-		typedef IncomingRequestHeader_obj OBJ_;
-		IncomingRequestHeader_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1c840e5c };
-
-		void __construct(::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.IncomingRequestHeader")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.IncomingRequestHeader"); }
-		static ::hx::ObjectPtr< IncomingRequestHeader_obj > __new(::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		static ::hx::ObjectPtr< IncomingRequestHeader_obj > __alloc(::hx::Ctx *_hx_ctx,::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IncomingRequestHeader_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IncomingRequestHeader",56,69,89,e3); }
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_IncomingRequestHeader */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/IncomingResponse.h b/Sources/c_snikket/iinclude/include/tink/http/IncomingResponse.h
deleted file mode 100644
index bf1e612..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/IncomingResponse.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_IncomingResponse
-#define INCLUDED_tink_http_IncomingResponse
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Message
-#include <tink/http/Message.h>
-#endif
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,IncomingResponse)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,ResponseHeaderBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES IncomingResponse_obj : public  ::tink::http::Message_obj
-{
-	public:
-		typedef  ::tink::http::Message_obj super;
-		typedef IncomingResponse_obj OBJ_;
-		IncomingResponse_obj();
-
-	public:
-		enum { _hx_ClassId = 0x68c65661 };
-
-		void __construct( ::tink::http::ResponseHeaderBase header,::Dynamic body);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.IncomingResponse")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.IncomingResponse"); }
-		static ::hx::ObjectPtr< IncomingResponse_obj > __new( ::tink::http::ResponseHeaderBase header,::Dynamic body);
-		static ::hx::ObjectPtr< IncomingResponse_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::http::ResponseHeaderBase header,::Dynamic body);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IncomingResponse_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IncomingResponse",a7,dd,f2,2c); }
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_IncomingResponse */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/Message.h b/Sources/c_snikket/iinclude/include/tink/http/Message.h
deleted file mode 100644
index df01137..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/Message.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_Message
-#define INCLUDED_tink_http_Message
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_STACK_FRAME(_hx_pos_bcbf082f6c47a594_8_new)
-HX_DECLARE_CLASS2(tink,http,Message)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES Message_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Message_obj OBJ_;
-		Message_obj();
-
-	public:
-		enum { _hx_ClassId = 0x7888e42d };
-
-		void __construct( ::Dynamic header, ::Dynamic body);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.Message")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.Message"); }
-
-		inline static ::hx::ObjectPtr< Message_obj > __new( ::Dynamic header, ::Dynamic body) {
-			::hx::ObjectPtr< Message_obj > __this = new Message_obj();
-			__this->__construct(header,body);
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Message_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic header, ::Dynamic body) {
-			Message_obj *__this = (Message_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Message_obj), true, "tink.http.Message"));
-			*(void **)__this = Message_obj::_hx_vtable;
-{
-            	HX_STACKFRAME(&_hx_pos_bcbf082f6c47a594_8_new)
-HXLINE(   9)		( ( ::tink::http::Message)(__this) )->header = header;
-HXLINE(  10)		( ( ::tink::http::Message)(__this) )->body = body;
-            	}
-		
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Message_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Message",a7,5d,62,67); }
-
-		 ::Dynamic header;
-		 ::Dynamic body;
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_Message */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/OutgoingRequest.h b/Sources/c_snikket/iinclude/include/tink/http/OutgoingRequest.h
deleted file mode 100644
index cbe4430..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/OutgoingRequest.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_OutgoingRequest
-#define INCLUDED_tink_http_OutgoingRequest
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Message
-#include <tink/http/Message.h>
-#endif
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequestHeader)
-HX_DECLARE_CLASS2(tink,http,RequestHeader)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES OutgoingRequest_obj : public  ::tink::http::Message_obj
-{
-	public:
-		typedef  ::tink::http::Message_obj super;
-		typedef OutgoingRequest_obj OBJ_;
-		OutgoingRequest_obj();
-
-	public:
-		enum { _hx_ClassId = 0x08bf21c5 };
-
-		void __construct( ::tink::http::OutgoingRequestHeader header,::Dynamic body);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.OutgoingRequest")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.OutgoingRequest"); }
-		static ::hx::ObjectPtr< OutgoingRequest_obj > __new( ::tink::http::OutgoingRequestHeader header,::Dynamic body);
-		static ::hx::ObjectPtr< OutgoingRequest_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::http::OutgoingRequestHeader header,::Dynamic body);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~OutgoingRequest_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("OutgoingRequest",23,1c,f4,79); }
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_OutgoingRequest */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/OutgoingRequestHeader.h b/Sources/c_snikket/iinclude/include/tink/http/OutgoingRequestHeader.h
deleted file mode 100644
index 89bb40c..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/OutgoingRequestHeader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_OutgoingRequestHeader
-#define INCLUDED_tink_http_OutgoingRequestHeader
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_RequestHeader
-#include <tink/http/RequestHeader.h>
-#endif
-HX_DECLARE_CLASS2(haxe,ds,Option)
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequestHeader)
-HX_DECLARE_CLASS2(tink,http,RequestHeader)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES OutgoingRequestHeader_obj : public  ::tink::http::RequestHeader_obj
-{
-	public:
-		typedef  ::tink::http::RequestHeader_obj super;
-		typedef OutgoingRequestHeader_obj OBJ_;
-		OutgoingRequestHeader_obj();
-
-	public:
-		enum { _hx_ClassId = 0x17e6c132 };
-
-		void __construct(::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.OutgoingRequestHeader")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.OutgoingRequestHeader"); }
-		static ::hx::ObjectPtr< OutgoingRequestHeader_obj > __new(::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		static ::hx::ObjectPtr< OutgoingRequestHeader_obj > __alloc(::hx::Ctx *_hx_ctx,::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~OutgoingRequestHeader_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("OutgoingRequestHeader",10,d6,f4,a2); }
-
-		static  ::haxe::ds::Option extractAuth( ::Dynamic url);
-		static ::Dynamic extractAuth_dyn();
-
-		 ::tink::http::OutgoingRequestHeader concat(::Array< ::Dynamic> fields);
-		::Dynamic concat_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_OutgoingRequestHeader */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/RequestHeader.h b/Sources/c_snikket/iinclude/include/tink/http/RequestHeader.h
deleted file mode 100644
index 465e640..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/RequestHeader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_RequestHeader
-#define INCLUDED_tink_http_RequestHeader
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Header
-#include <tink/http/Header.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-HX_DECLARE_CLASS2(tink,http,RequestHeader)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES RequestHeader_obj : public  ::tink::http::Header_obj
-{
-	public:
-		typedef  ::tink::http::Header_obj super;
-		typedef RequestHeader_obj OBJ_;
-		RequestHeader_obj();
-
-	public:
-		enum { _hx_ClassId = 0x72a5c122 };
-
-		void __construct(::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.RequestHeader")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.RequestHeader"); }
-		static ::hx::ObjectPtr< RequestHeader_obj > __new(::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		static ::hx::ObjectPtr< RequestHeader_obj > __alloc(::hx::Ctx *_hx_ctx,::String method, ::Dynamic url,::String __o_protocol,::Array< ::Dynamic> fields);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~RequestHeader_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("RequestHeader",1c,92,9a,00); }
-
-		::String method;
-		 ::Dynamic url;
-		::String protocol;
-		virtual ::String toString();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_RequestHeader */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/ResponseHeaderBase.h b/Sources/c_snikket/iinclude/include/tink/http/ResponseHeaderBase.h
deleted file mode 100644
index e02ec11..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/ResponseHeaderBase.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_ResponseHeaderBase
-#define INCLUDED_tink_http_ResponseHeaderBase
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Header
-#include <tink/http/Header.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,NamedWith)
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,HeaderField)
-HX_DECLARE_CLASS2(tink,http,ResponseHeaderBase)
-HX_DECLARE_CLASS2(tink,io,StreamParserObject)
-
-namespace tink{
-namespace http{
-
-
-class HXCPP_CLASS_ATTRIBUTES ResponseHeaderBase_obj : public  ::tink::http::Header_obj
-{
-	public:
-		typedef  ::tink::http::Header_obj super;
-		typedef ResponseHeaderBase_obj OBJ_;
-		ResponseHeaderBase_obj();
-
-	public:
-		enum { _hx_ClassId = 0x68228641 };
-
-		void __construct(int statusCode,::String reason,::Array< ::Dynamic> fields,::String __o_protocol);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.ResponseHeaderBase")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.ResponseHeaderBase"); }
-		static ::hx::ObjectPtr< ResponseHeaderBase_obj > __new(int statusCode,::String reason,::Array< ::Dynamic> fields,::String __o_protocol);
-		static ::hx::ObjectPtr< ResponseHeaderBase_obj > __alloc(::hx::Ctx *_hx_ctx,int statusCode,::String reason,::Array< ::Dynamic> fields,::String __o_protocol);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ResponseHeaderBase_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ResponseHeaderBase",3f,ca,db,63); }
-
-		static ::Dynamic parser();
-		static ::Dynamic parser_dyn();
-
-		int statusCode;
-		::String reason;
-		::String protocol;
-		virtual ::String toString();
-
-};
-
-} // end namespace tink
-} // end namespace http
-
-#endif /* INCLUDED_tink_http_ResponseHeaderBase */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/_Client/CustomClient.h b/Sources/c_snikket/iinclude/include/tink/http/_Client/CustomClient.h
deleted file mode 100644
index 75eff5b..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/_Client/CustomClient.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http__Client_CustomClient
-#define INCLUDED_tink_http__Client_CustomClient
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_ClientObject
-#include <tink/http/ClientObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,IncomingResponse)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-HX_DECLARE_CLASS3(tink,http,_Client,CustomClient)
-
-namespace tink{
-namespace http{
-namespace _Client{
-
-
-class HXCPP_CLASS_ATTRIBUTES CustomClient_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef CustomClient_obj OBJ_;
-		CustomClient_obj();
-
-	public:
-		enum { _hx_ClassId = 0x16257e84 };
-
-		void __construct(::Array< ::Dynamic> preprocessors,::Array< ::Dynamic> postprocessors,::Dynamic real);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http._Client.CustomClient")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http._Client.CustomClient"); }
-		static ::hx::ObjectPtr< CustomClient_obj > __new(::Array< ::Dynamic> preprocessors,::Array< ::Dynamic> postprocessors,::Dynamic real);
-		static ::hx::ObjectPtr< CustomClient_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< ::Dynamic> preprocessors,::Array< ::Dynamic> postprocessors,::Dynamic real);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~CustomClient_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("CustomClient",fc,6c,ff,d1); }
-
-		static ::cpp::VirtualArray concat(::cpp::VirtualArray a,::cpp::VirtualArray b);
-		static ::Dynamic concat_dyn();
-
-		static  ::tink::http::_Client::CustomClient create(::Dynamic c,::Array< ::Dynamic> preprocessors,::Array< ::Dynamic> postprocessors);
-		static ::Dynamic create_dyn();
-
-		::Array< ::Dynamic> preprocessors;
-		::Array< ::Dynamic> postprocessors;
-		::Dynamic real;
-		 ::tink::core::_Future::FutureObject pipe( ::Dynamic value,::Array< ::Dynamic> transforms, ::Dynamic index);
-		::Dynamic pipe_dyn();
-
-		 ::tink::core::_Future::FutureObject request( ::tink::http::OutgoingRequest req);
-		::Dynamic request_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace _Client
-
-#endif /* INCLUDED_tink_http__Client_CustomClient */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/_Fetch/FetchResponse_Impl_.h b/Sources/c_snikket/iinclude/include/tink/http/_Fetch/FetchResponse_Impl_.h
deleted file mode 100644
index 0227082..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/_Fetch/FetchResponse_Impl_.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http__Fetch_FetchResponse_Impl_
-#define INCLUDED_tink_http__Fetch_FetchResponse_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,http,_Fetch,FetchResponse_Impl_)
-
-namespace tink{
-namespace http{
-namespace _Fetch{
-
-
-class HXCPP_CLASS_ATTRIBUTES FetchResponse_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef FetchResponse_Impl__obj OBJ_;
-		FetchResponse_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x706f0b26 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.http._Fetch.FetchResponse_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.http._Fetch.FetchResponse_Impl_"); }
-
-		inline static ::hx::ObjectPtr< FetchResponse_Impl__obj > __new() {
-			::hx::ObjectPtr< FetchResponse_Impl__obj > __this = new FetchResponse_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< FetchResponse_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			FetchResponse_Impl__obj *__this = (FetchResponse_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(FetchResponse_Impl__obj), false, "tink.http._Fetch.FetchResponse_Impl_"));
-			*(void **)__this = FetchResponse_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FetchResponse_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("FetchResponse_Impl_",9b,93,47,bc); }
-
-		static  ::tink::core::_Future::FutureObject all( ::tink::core::_Future::FutureObject this1);
-		static ::Dynamic all_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace _Fetch
-
-#endif /* INCLUDED_tink_http__Fetch_FetchResponse_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/_Header/HeaderValue_Impl_.h b/Sources/c_snikket/iinclude/include/tink/http/_Header/HeaderValue_Impl_.h
deleted file mode 100644
index a0fbe32..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/_Header/HeaderValue_Impl_.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http__Header_HeaderValue_Impl_
-#define INCLUDED_tink_http__Header_HeaderValue_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,http,_Header,HeaderValue_Impl_)
-
-namespace tink{
-namespace http{
-namespace _Header{
-
-
-class HXCPP_CLASS_ATTRIBUTES HeaderValue_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef HeaderValue_Impl__obj OBJ_;
-		HeaderValue_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x58df80d2 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.http._Header.HeaderValue_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.http._Header.HeaderValue_Impl_"); }
-
-		inline static ::hx::ObjectPtr< HeaderValue_Impl__obj > __new() {
-			::hx::ObjectPtr< HeaderValue_Impl__obj > __this = new HeaderValue_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< HeaderValue_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			HeaderValue_Impl__obj *__this = (HeaderValue_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(HeaderValue_Impl__obj), false, "tink.http._Header.HeaderValue_Impl_"));
-			*(void **)__this = HeaderValue_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~HeaderValue_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("HeaderValue_Impl_",24,b6,26,b3); }
-
-		static ::String basicAuth(::String username,::String password);
-		static ::Dynamic basicAuth_dyn();
-
-		static ::String ofInt(int i);
-		static ::Dynamic ofInt_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace _Header
-
-#endif /* INCLUDED_tink_http__Header_HeaderValue_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/_Response/OutgoingResponseData.h b/Sources/c_snikket/iinclude/include/tink/http/_Response/OutgoingResponseData.h
deleted file mode 100644
index 7279c3c..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/_Response/OutgoingResponseData.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http__Response_OutgoingResponseData
-#define INCLUDED_tink_http__Response_OutgoingResponseData
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Message
-#include <tink/http/Message.h>
-#endif
-HX_DECLARE_CLASS2(tink,http,Header)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,ResponseHeaderBase)
-HX_DECLARE_CLASS3(tink,http,_Response,OutgoingResponseData)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace http{
-namespace _Response{
-
-
-class HXCPP_CLASS_ATTRIBUTES OutgoingResponseData_obj : public  ::tink::http::Message_obj
-{
-	public:
-		typedef  ::tink::http::Message_obj super;
-		typedef OutgoingResponseData_obj OBJ_;
-		OutgoingResponseData_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0dfa253d };
-
-		void __construct( ::tink::http::ResponseHeaderBase header,::Dynamic body);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http._Response.OutgoingResponseData")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http._Response.OutgoingResponseData"); }
-		static ::hx::ObjectPtr< OutgoingResponseData_obj > __new( ::tink::http::ResponseHeaderBase header,::Dynamic body);
-		static ::hx::ObjectPtr< OutgoingResponseData_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::http::ResponseHeaderBase header,::Dynamic body);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~OutgoingResponseData_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("OutgoingResponseData",f7,c7,68,aa); }
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace _Response
-
-#endif /* INCLUDED_tink_http__Response_OutgoingResponseData */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/clients/CurlClient.h b/Sources/c_snikket/iinclude/include/tink/http/clients/CurlClient.h
deleted file mode 100644
index f926bf5..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/clients/CurlClient.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_clients_CurlClient
-#define INCLUDED_tink_http_clients_CurlClient
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_ClientObject
-#include <tink/http/ClientObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-HX_DECLARE_CLASS3(tink,http,clients,CurlClient)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace http{
-namespace clients{
-
-
-class HXCPP_CLASS_ATTRIBUTES CurlClient_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef CurlClient_obj OBJ_;
-		CurlClient_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1ef1a485 };
-
-		void __construct( ::Dynamic curl);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.clients.CurlClient")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.clients.CurlClient"); }
-		static ::hx::ObjectPtr< CurlClient_obj > __new( ::Dynamic curl);
-		static ::hx::ObjectPtr< CurlClient_obj > __alloc(::hx::Ctx *_hx_ctx, ::Dynamic curl);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		static void __alloc_dynamic_functions(::hx::Ctx *_hx_alloc,CurlClient_obj *_hx_obj);
-		//~CurlClient_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("CurlClient",77,86,3b,fe); }
-
-		 ::tink::core::_Future::FutureObject request( ::tink::http::OutgoingRequest req);
-		::Dynamic request_dyn();
-
-		::Dynamic curl;
-		inline ::Dynamic &curl_dyn() {return curl; }
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace clients
-
-#endif /* INCLUDED_tink_http_clients_CurlClient */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/clients/Helpers.h b/Sources/c_snikket/iinclude/include/tink/http/clients/Helpers.h
deleted file mode 100644
index ce58cd0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/clients/Helpers.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_clients_Helpers
-#define INCLUDED_tink_http_clients_Helpers
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,ds,Option)
-HX_DECLARE_CLASS3(tink,http,clients,Helpers)
-
-namespace tink{
-namespace http{
-namespace clients{
-
-
-class HXCPP_CLASS_ATTRIBUTES Helpers_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Helpers_obj OBJ_;
-		Helpers_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1dfdf71f };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.http.clients.Helpers")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.http.clients.Helpers"); }
-
-		inline static ::hx::ObjectPtr< Helpers_obj > __new() {
-			::hx::ObjectPtr< Helpers_obj > __this = new Helpers_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Helpers_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Helpers_obj *__this = (Helpers_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Helpers_obj), false, "tink.http.clients.Helpers"));
-			*(void **)__this = Helpers_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Helpers_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Helpers",25,6b,b0,8d); }
-
-		static  ::haxe::ds::Option checkScheme(::String s);
-		static ::Dynamic checkScheme_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace clients
-
-#endif /* INCLUDED_tink_http_clients_Helpers */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/clients/LocalContainerClient.h b/Sources/c_snikket/iinclude/include/tink/http/clients/LocalContainerClient.h
deleted file mode 100644
index 6e1785e..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/clients/LocalContainerClient.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_clients_LocalContainerClient
-#define INCLUDED_tink_http_clients_LocalContainerClient
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_ClientObject
-#include <tink/http/ClientObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,Container)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-HX_DECLARE_CLASS3(tink,http,clients,LocalContainerClient)
-HX_DECLARE_CLASS3(tink,http,containers,LocalContainer)
-
-namespace tink{
-namespace http{
-namespace clients{
-
-
-class HXCPP_CLASS_ATTRIBUTES LocalContainerClient_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef LocalContainerClient_obj OBJ_;
-		LocalContainerClient_obj();
-
-	public:
-		enum { _hx_ClassId = 0x4c48d30b };
-
-		void __construct( ::tink::http::containers::LocalContainer container);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.clients.LocalContainerClient")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.clients.LocalContainerClient"); }
-		static ::hx::ObjectPtr< LocalContainerClient_obj > __new( ::tink::http::containers::LocalContainer container);
-		static ::hx::ObjectPtr< LocalContainerClient_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::http::containers::LocalContainer container);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~LocalContainerClient_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("LocalContainerClient",61,95,42,2f); }
-
-		 ::tink::http::containers::LocalContainer container;
-		 ::tink::core::_Future::FutureObject request( ::tink::http::OutgoingRequest req);
-		::Dynamic request_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace clients
-
-#endif /* INCLUDED_tink_http_clients_LocalContainerClient */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/clients/SocketClient.h b/Sources/c_snikket/iinclude/include/tink/http/clients/SocketClient.h
deleted file mode 100644
index 71e2c7f..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/clients/SocketClient.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_clients_SocketClient
-#define INCLUDED_tink_http_clients_SocketClient
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_ClientObject
-#include <tink/http/ClientObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-HX_DECLARE_CLASS3(tink,http,clients,SocketClient)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-
-namespace tink{
-namespace http{
-namespace clients{
-
-
-class HXCPP_CLASS_ATTRIBUTES SocketClient_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SocketClient_obj OBJ_;
-		SocketClient_obj();
-
-	public:
-		enum { _hx_ClassId = 0x29ac2844 };
-
-		void __construct(::Dynamic worker);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.clients.SocketClient")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.clients.SocketClient"); }
-		static ::hx::ObjectPtr< SocketClient_obj > __new(::Dynamic worker);
-		static ::hx::ObjectPtr< SocketClient_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic worker);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SocketClient_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("SocketClient",7e,5e,b9,60); }
-
-		::Dynamic worker;
-		 ::tink::core::_Future::FutureObject request( ::tink::http::OutgoingRequest req);
-		::Dynamic request_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace clients
-
-#endif /* INCLUDED_tink_http_clients_SocketClient */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/clients/StdClient.h b/Sources/c_snikket/iinclude/include/tink/http/clients/StdClient.h
deleted file mode 100644
index bc59cd0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/clients/StdClient.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_clients_StdClient
-#define INCLUDED_tink_http_clients_StdClient
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_ClientObject
-#include <tink/http/ClientObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,ClientObject)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS2(tink,http,OutgoingRequest)
-HX_DECLARE_CLASS3(tink,http,clients,StdClient)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-
-namespace tink{
-namespace http{
-namespace clients{
-
-
-class HXCPP_CLASS_ATTRIBUTES StdClient_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StdClient_obj OBJ_;
-		StdClient_obj();
-
-	public:
-		enum { _hx_ClassId = 0x6b1f5144 };
-
-		void __construct(::Dynamic worker);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.clients.StdClient")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.clients.StdClient"); }
-		static ::hx::ObjectPtr< StdClient_obj > __new(::Dynamic worker);
-		static ::hx::ObjectPtr< StdClient_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic worker);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StdClient_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("StdClient",2e,63,67,cc); }
-
-		::Dynamic worker;
-		 ::tink::core::_Future::FutureObject request( ::tink::http::OutgoingRequest req);
-		::Dynamic request_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace clients
-
-#endif /* INCLUDED_tink_http_clients_StdClient */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/http/containers/LocalContainer.h b/Sources/c_snikket/iinclude/include/tink/http/containers/LocalContainer.h
deleted file mode 100644
index 09cbd34..0000000
--- a/Sources/c_snikket/iinclude/include/tink/http/containers/LocalContainer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_http_containers_LocalContainer
-#define INCLUDED_tink_http_containers_LocalContainer
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_http_Container
-#include <tink/http/Container.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,http,Container)
-HX_DECLARE_CLASS2(tink,http,HandlerObject)
-HX_DECLARE_CLASS2(tink,http,IncomingRequest)
-HX_DECLARE_CLASS2(tink,http,Message)
-HX_DECLARE_CLASS3(tink,http,containers,LocalContainer)
-
-namespace tink{
-namespace http{
-namespace containers{
-
-
-class HXCPP_CLASS_ATTRIBUTES LocalContainer_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef LocalContainer_obj OBJ_;
-		LocalContainer_obj();
-
-	public:
-		enum { _hx_ClassId = 0x315b134a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.http.containers.LocalContainer")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.http.containers.LocalContainer"); }
-		static ::hx::ObjectPtr< LocalContainer_obj > __new();
-		static ::hx::ObjectPtr< LocalContainer_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~LocalContainer_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("LocalContainer",76,1a,ea,cb); }
-
-		::Dynamic handler;
-		bool running;
-		 ::tink::core::_Future::FutureObject serve( ::tink::http::IncomingRequest req);
-		::Dynamic serve_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace http
-} // end namespace containers
-
-#endif /* INCLUDED_tink_http_containers_LocalContainer */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/BytewiseParser.h b/Sources/c_snikket/iinclude/include/tink/io/BytewiseParser.h
deleted file mode 100644
index 487c7a1..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/BytewiseParser.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_BytewiseParser
-#define INCLUDED_tink_io_BytewiseParser
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_io_StreamParserObject
-#include <tink/io/StreamParserObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,chunk,ChunkCursor)
-HX_DECLARE_CLASS2(tink,core,Outcome)
-HX_DECLARE_CLASS2(tink,io,BytewiseParser)
-HX_DECLARE_CLASS2(tink,io,ParseStep)
-HX_DECLARE_CLASS2(tink,io,StreamParserObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES BytewiseParser_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef BytewiseParser_obj OBJ_;
-		BytewiseParser_obj();
-
-	public:
-		enum { _hx_ClassId = 0x66915863 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io.BytewiseParser")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io.BytewiseParser"); }
-
-		inline static ::hx::ObjectPtr< BytewiseParser_obj > __new() {
-			::hx::ObjectPtr< BytewiseParser_obj > __this = new BytewiseParser_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< BytewiseParser_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			BytewiseParser_obj *__this = (BytewiseParser_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(BytewiseParser_obj), false, "tink.io.BytewiseParser"));
-			*(void **)__this = BytewiseParser_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~BytewiseParser_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("BytewiseParser",4b,c6,88,ee); }
-
-		virtual  ::tink::io::ParseStep read(int _hx_char);
-		::Dynamic read_dyn();
-
-		 ::tink::io::ParseStep progress( ::tink::chunk::ChunkCursor cursor);
-		::Dynamic progress_dyn();
-
-		 ::tink::core::Outcome eof( ::tink::chunk::ChunkCursor rest);
-		::Dynamic eof_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_BytewiseParser */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/IdealSourceTools.h b/Sources/c_snikket/iinclude/include/tink/io/IdealSourceTools.h
deleted file mode 100644
index c7d617b..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/IdealSourceTools.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_IdealSourceTools
-#define INCLUDED_tink_io_IdealSourceTools
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,IdealSourceTools)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES IdealSourceTools_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef IdealSourceTools_obj OBJ_;
-		IdealSourceTools_obj();
-
-	public:
-		enum { _hx_ClassId = 0x186409e3 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io.IdealSourceTools")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io.IdealSourceTools"); }
-
-		inline static ::hx::ObjectPtr< IdealSourceTools_obj > __new() {
-			::hx::ObjectPtr< IdealSourceTools_obj > __this = new IdealSourceTools_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< IdealSourceTools_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			IdealSourceTools_obj *__this = (IdealSourceTools_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(IdealSourceTools_obj), false, "tink.io.IdealSourceTools"));
-			*(void **)__this = IdealSourceTools_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IdealSourceTools_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IdealSourceTools",cb,c1,80,1f); }
-
-		static  ::tink::core::_Future::FutureObject all(::Dynamic s);
-		static ::Dynamic all_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_IdealSourceTools */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/ParseResult.h b/Sources/c_snikket/iinclude/include/tink/io/ParseResult.h
deleted file mode 100644
index 49ac084..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/ParseResult.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_ParseResult
-#define INCLUDED_tink_io_ParseResult
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,io,ParseResult)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace io{
-
-
-class ParseResult_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef ParseResult_obj OBJ_;
-
-	public:
-		ParseResult_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.io.ParseResult",c4,44,ed,6f); }
-		::String __ToString() const { return HX_("ParseResult.",de,f8,43,8d) + _hx_tag; }
-
-		static ::tink::io::ParseResult Broke( ::tink::core::TypedError e);
-		static ::Dynamic Broke_dyn();
-		static ::tink::io::ParseResult Invalid( ::tink::core::TypedError e,::Dynamic rest);
-		static ::Dynamic Invalid_dyn();
-		static ::tink::io::ParseResult Parsed( ::Dynamic data,::Dynamic rest);
-		static ::Dynamic Parsed_dyn();
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_ParseResult */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/ParseStep.h b/Sources/c_snikket/iinclude/include/tink/io/ParseStep.h
deleted file mode 100644
index 05a3784..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/ParseStep.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_ParseStep
-#define INCLUDED_tink_io_ParseStep
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,io,ParseStep)
-namespace tink{
-namespace io{
-
-
-class ParseStep_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef ParseStep_obj OBJ_;
-
-	public:
-		ParseStep_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.io.ParseStep",73,2b,8e,cf); }
-		::String __ToString() const { return HX_("ParseStep.",4f,c6,a0,a4) + _hx_tag; }
-
-		static ::tink::io::ParseStep Done( ::Dynamic r);
-		static ::Dynamic Done_dyn();
-		static ::tink::io::ParseStep Failed( ::tink::core::TypedError e);
-		static ::Dynamic Failed_dyn();
-		static ::tink::io::ParseStep Progressed;
-		static inline ::tink::io::ParseStep Progressed_dyn() { return Progressed; }
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_ParseStep */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/PipeResult.h b/Sources/c_snikket/iinclude/include/tink/io/PipeResult.h
deleted file mode 100644
index 167b3e7..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/PipeResult.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_PipeResult
-#define INCLUDED_tink_io_PipeResult
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,io,PipeResult)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace io{
-
-
-class PipeResult_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef PipeResult_obj OBJ_;
-
-	public:
-		PipeResult_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.io.PipeResult",d7,3e,a3,6f); }
-		::String __ToString() const { return HX_("PipeResult.",03,26,3a,37) + _hx_tag; }
-
-		static ::tink::io::PipeResult AllWritten;
-		static inline ::tink::io::PipeResult AllWritten_dyn() { return AllWritten; }
-		static ::tink::io::PipeResult SinkEnded( ::Dynamic result,::Dynamic rest);
-		static ::Dynamic SinkEnded_dyn();
-		static ::tink::io::PipeResult SinkFailed( ::tink::core::TypedError e,::Dynamic rest);
-		static ::Dynamic SinkFailed_dyn();
-		static ::tink::io::PipeResult SourceFailed( ::tink::core::TypedError e);
-		static ::Dynamic SourceFailed_dyn();
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_PipeResult */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/PipeResultTools.h b/Sources/c_snikket/iinclude/include/tink/io/PipeResultTools.h
deleted file mode 100644
index de6e225..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/PipeResultTools.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_PipeResultTools
-#define INCLUDED_tink_io_PipeResultTools
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,chunk,ChunkObject)
-HX_DECLARE_CLASS2(tink,io,PipeResult)
-HX_DECLARE_CLASS2(tink,io,PipeResultTools)
-HX_DECLARE_CLASS2(tink,streams,Conclusion)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES PipeResultTools_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef PipeResultTools_obj OBJ_;
-		PipeResultTools_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0add7938 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io.PipeResultTools")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io.PipeResultTools"); }
-
-		inline static ::hx::ObjectPtr< PipeResultTools_obj > __new() {
-			::hx::ObjectPtr< PipeResultTools_obj > __this = new PipeResultTools_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< PipeResultTools_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			PipeResultTools_obj *__this = (PipeResultTools_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(PipeResultTools_obj), false, "tink.io.PipeResultTools"));
-			*(void **)__this = PipeResultTools_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~PipeResultTools_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("PipeResultTools",50,36,66,7b); }
-
-		static  ::tink::io::PipeResult toResult( ::tink::streams::Conclusion c, ::Dynamic result,::Dynamic buffered);
-		static ::Dynamic toResult_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_PipeResultTools */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/RealSourceTools.h b/Sources/c_snikket/iinclude/include/tink/io/RealSourceTools.h
deleted file mode 100644
index 40852fc..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/RealSourceTools.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_RealSourceTools
-#define INCLUDED_tink_io_RealSourceTools
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,RealSourceTools)
-HX_DECLARE_CLASS2(tink,io,StreamParserObject)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES RealSourceTools_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef RealSourceTools_obj OBJ_;
-		RealSourceTools_obj();
-
-	public:
-		enum { _hx_ClassId = 0x688b0f4a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io.RealSourceTools")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io.RealSourceTools"); }
-
-		inline static ::hx::ObjectPtr< RealSourceTools_obj > __new() {
-			::hx::ObjectPtr< RealSourceTools_obj > __this = new RealSourceTools_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< RealSourceTools_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			RealSourceTools_obj *__this = (RealSourceTools_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(RealSourceTools_obj), false, "tink.io.RealSourceTools"));
-			*(void **)__this = RealSourceTools_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~RealSourceTools_obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("RealSourceTools",62,cc,13,d9); }
-
-		static  ::tink::core::_Future::FutureObject all(::Dynamic s);
-		static ::Dynamic all_dyn();
-
-		static  ::tink::core::_Future::FutureObject parse(::Dynamic s,::Dynamic p);
-		static ::Dynamic parse_dyn();
-
-		static ::Dynamic idealize(::Dynamic s, ::Dynamic rescue);
-		static ::Dynamic idealize_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_RealSourceTools */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/SinkBase.h b/Sources/c_snikket/iinclude/include/tink/io/SinkBase.h
deleted file mode 100644
index 30475bb..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/SinkBase.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_SinkBase
-#define INCLUDED_tink_io_SinkBase
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_io_SinkObject
-#include <tink/io/SinkObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,SinkBase)
-HX_DECLARE_CLASS2(tink,io,SinkObject)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES SinkBase_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SinkBase_obj OBJ_;
-		SinkBase_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1efa06a0 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io.SinkBase")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io.SinkBase"); }
-
-		inline static ::hx::ObjectPtr< SinkBase_obj > __new() {
-			::hx::ObjectPtr< SinkBase_obj > __this = new SinkBase_obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< SinkBase_obj > __alloc(::hx::Ctx *_hx_ctx) {
-			SinkBase_obj *__this = (SinkBase_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(SinkBase_obj), false, "tink.io.SinkBase"));
-			*(void **)__this = SinkBase_obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SinkBase_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("SinkBase",24,8c,b4,5c); }
-
-		virtual  ::tink::core::_Future::FutureObject consume(::Dynamic source, ::Dynamic options);
-		::Dynamic consume_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_SinkBase */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/SinkObject.h b/Sources/c_snikket/iinclude/include/tink/io/SinkObject.h
deleted file mode 100644
index bf9b6e3..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/SinkObject.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_SinkObject
-#define INCLUDED_tink_io_SinkObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,SinkObject)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES SinkObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::tink::core::_Future::FutureObject (::hx::Object :: *_hx_consume)(::Dynamic source, ::Dynamic options); 
-		static inline  ::tink::core::_Future::FutureObject consume( ::Dynamic _hx_,::Dynamic source, ::Dynamic options) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::io::SinkObject_obj *>(_hx_.mPtr->_hx_getInterface(0x483020ea)))->_hx_consume)(source,options);
-		}
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_SinkObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/StreamParserObject.h b/Sources/c_snikket/iinclude/include/tink/io/StreamParserObject.h
deleted file mode 100644
index 290d16b..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/StreamParserObject.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_StreamParserObject
-#define INCLUDED_tink_io_StreamParserObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,chunk,ChunkCursor)
-HX_DECLARE_CLASS2(tink,core,Outcome)
-HX_DECLARE_CLASS2(tink,io,ParseStep)
-HX_DECLARE_CLASS2(tink,io,StreamParserObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES StreamParserObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::tink::io::ParseStep (::hx::Object :: *_hx_progress)( ::tink::chunk::ChunkCursor cursor); 
-		static inline  ::tink::io::ParseStep progress( ::Dynamic _hx_, ::tink::chunk::ChunkCursor cursor) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::io::StreamParserObject_obj *>(_hx_.mPtr->_hx_getInterface(0x048ef116)))->_hx_progress)(cursor);
-		}
-		 ::tink::core::Outcome (::hx::Object :: *_hx_eof)( ::tink::chunk::ChunkCursor rest); 
-		static inline  ::tink::core::Outcome eof( ::Dynamic _hx_, ::tink::chunk::ChunkCursor rest) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::io::StreamParserObject_obj *>(_hx_.mPtr->_hx_getInterface(0x048ef116)))->_hx_eof)(rest);
-		}
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_StreamParserObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/WorkerObject.h b/Sources/c_snikket/iinclude/include/tink/io/WorkerObject.h
deleted file mode 100644
index 152ff58..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/WorkerObject.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_WorkerObject
-#define INCLUDED_tink_io_WorkerObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-
-namespace tink{
-namespace io{
-
-
-class HXCPP_CLASS_ATTRIBUTES WorkerObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		 ::tink::core::_Future::FutureObject (::hx::Object :: *_hx_work)(::Dynamic task); 
-		static inline  ::tink::core::_Future::FutureObject work( ::Dynamic _hx_,::Dynamic task) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::io::WorkerObject_obj *>(_hx_.mPtr->_hx_getInterface(0xdcf3fb55)))->_hx_work)(task);
-		}
-};
-
-} // end namespace tink
-} // end namespace io
-
-#endif /* INCLUDED_tink_io_WorkerObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/_Sink/SinkYielding_Impl_.h b/Sources/c_snikket/iinclude/include/tink/io/_Sink/SinkYielding_Impl_.h
deleted file mode 100644
index 2e51a31..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/_Sink/SinkYielding_Impl_.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io__Sink_SinkYielding_Impl_
-#define INCLUDED_tink_io__Sink_SinkYielding_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS2(tink,io,SinkObject)
-HX_DECLARE_CLASS3(tink,io,_Sink,SinkYielding_Impl_)
-
-namespace tink{
-namespace io{
-namespace _Sink{
-
-
-class HXCPP_CLASS_ATTRIBUTES SinkYielding_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef SinkYielding_Impl__obj OBJ_;
-		SinkYielding_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x1dd8821a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io._Sink.SinkYielding_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io._Sink.SinkYielding_Impl_"); }
-
-		inline static ::hx::ObjectPtr< SinkYielding_Impl__obj > __new() {
-			::hx::ObjectPtr< SinkYielding_Impl__obj > __this = new SinkYielding_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< SinkYielding_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			SinkYielding_Impl__obj *__this = (SinkYielding_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(SinkYielding_Impl__obj), false, "tink.io._Sink.SinkYielding_Impl_"));
-			*(void **)__this = SinkYielding_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~SinkYielding_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("SinkYielding_Impl_",e8,ec,49,5e); }
-
-		static ::Dynamic ofOutput(::String name, ::haxe::io::Output target, ::Dynamic options);
-		static ::Dynamic ofOutput_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace _Sink
-
-#endif /* INCLUDED_tink_io__Sink_SinkYielding_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/_Source/Source_Impl_.h b/Sources/c_snikket/iinclude/include/tink/io/_Source/Source_Impl_.h
deleted file mode 100644
index d119491..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/_Source/Source_Impl_.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io__Source_Source_Impl_
-#define INCLUDED_tink_io__Source_Source_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,SinkObject)
-HX_DECLARE_CLASS3(tink,io,_Source,Source_Impl_)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-namespace _Source{
-
-
-class HXCPP_CLASS_ATTRIBUTES Source_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Source_Impl__obj OBJ_;
-		Source_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x52c5539d };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io._Source.Source_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io._Source.Source_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Source_Impl__obj > __new() {
-			::hx::ObjectPtr< Source_Impl__obj > __this = new Source_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Source_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Source_Impl__obj *__this = (Source_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Source_Impl__obj), false, "tink.io._Source.Source_Impl_"));
-			*(void **)__this = Source_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Source_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Source_Impl_",db,cf,0d,d6); }
-
-		static void __boot();
-		static ::Dynamic EMPTY;
-		static ::Dynamic chunked(::Dynamic this1);
-		static ::Dynamic chunked_dyn();
-
-		static  ::tink::core::_Future::FutureObject concatAll(::Dynamic s);
-		static ::Dynamic concatAll_dyn();
-
-		static  ::tink::core::_Future::FutureObject pipeTo(::Dynamic this1,::Dynamic target, ::Dynamic options);
-		static ::Dynamic pipeTo_dyn();
-
-		static ::Dynamic limit(::Dynamic this1,int len);
-		static ::Dynamic limit_dyn();
-
-		static ::Dynamic ofError( ::tink::core::TypedError e);
-		static ::Dynamic ofError_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace _Source
-
-#endif /* INCLUDED_tink_io__Source_Source_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/_StreamParser/StreamParser_Impl_.h b/Sources/c_snikket/iinclude/include/tink/io/_StreamParser/StreamParser_Impl_.h
deleted file mode 100644
index 357b028..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/_StreamParser/StreamParser_Impl_.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io__StreamParser_StreamParser_Impl_
-#define INCLUDED_tink_io__StreamParser_StreamParser_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,StreamParserObject)
-HX_DECLARE_CLASS3(tink,io,_StreamParser,StreamParser_Impl_)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-namespace _StreamParser{
-
-
-class HXCPP_CLASS_ATTRIBUTES StreamParser_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StreamParser_Impl__obj OBJ_;
-		StreamParser_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x18cfe7c1 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io._StreamParser.StreamParser_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io._StreamParser.StreamParser_Impl_"); }
-
-		inline static ::hx::ObjectPtr< StreamParser_Impl__obj > __new() {
-			::hx::ObjectPtr< StreamParser_Impl__obj > __this = new StreamParser_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< StreamParser_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			StreamParser_Impl__obj *__this = (StreamParser_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(StreamParser_Impl__obj), false, "tink.io._StreamParser.StreamParser_Impl_"));
-			*(void **)__this = StreamParser_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StreamParser_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("StreamParser_Impl_",7f,8f,ef,63); }
-
-		static  ::tink::core::_Future::FutureObject doParse(::Dynamic source,::Dynamic p, ::Dynamic consume, ::Dynamic finish);
-		static ::Dynamic doParse_dyn();
-
-		static  ::tink::core::_Future::FutureObject parse(::Dynamic s,::Dynamic p);
-		static ::Dynamic parse_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace _StreamParser
-
-#endif /* INCLUDED_tink_io__StreamParser_StreamParser_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/_Worker/EagerWorker.h b/Sources/c_snikket/iinclude/include/tink/io/_Worker/EagerWorker.h
deleted file mode 100644
index 0529ae7..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/_Worker/EagerWorker.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io__Worker_EagerWorker
-#define INCLUDED_tink_io__Worker_EagerWorker
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_io_WorkerObject
-#include <tink/io/WorkerObject.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-HX_DECLARE_CLASS3(tink,io,_Worker,EagerWorker)
-
-namespace tink{
-namespace io{
-namespace _Worker{
-
-
-class HXCPP_CLASS_ATTRIBUTES EagerWorker_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef EagerWorker_obj OBJ_;
-		EagerWorker_obj();
-
-	public:
-		enum { _hx_ClassId = 0x49fe0131 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io._Worker.EagerWorker")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io._Worker.EagerWorker"); }
-		static ::hx::ObjectPtr< EagerWorker_obj > __new();
-		static ::hx::ObjectPtr< EagerWorker_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~EagerWorker_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("EagerWorker",36,20,f4,8a); }
-
-		 ::tink::core::_Future::FutureObject work(::Dynamic task);
-		::Dynamic work_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace _Worker
-
-#endif /* INCLUDED_tink_io__Worker_EagerWorker */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/_Worker/Worker_Impl_.h b/Sources/c_snikket/iinclude/include/tink/io/_Worker/Worker_Impl_.h
deleted file mode 100644
index 76182c0..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/_Worker/Worker_Impl_.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io__Worker_Worker_Impl_
-#define INCLUDED_tink_io__Worker_Worker_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-HX_DECLARE_CLASS3(tink,io,_Worker,Worker_Impl_)
-
-namespace tink{
-namespace io{
-namespace _Worker{
-
-
-class HXCPP_CLASS_ATTRIBUTES Worker_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Worker_Impl__obj OBJ_;
-		Worker_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x132db49b };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.io._Worker.Worker_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.io._Worker.Worker_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Worker_Impl__obj > __new() {
-			::hx::ObjectPtr< Worker_Impl__obj > __this = new Worker_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Worker_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Worker_Impl__obj *__this = (Worker_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Worker_Impl__obj), false, "tink.io._Worker.Worker_Impl_"));
-			*(void **)__this = Worker_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Worker_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Worker_Impl_",be,2b,8e,66); }
-
-		static void __boot();
-		static ::Dynamic EAGER;
-		static ::Array< ::Dynamic> pool;
-		static ::Dynamic ensure(::Dynamic this1);
-		static ::Dynamic ensure_dyn();
-
-		static ::Dynamic get();
-		static ::Dynamic get_dyn();
-
-		static  ::tink::core::_Future::FutureObject work(::Dynamic this1,::Dynamic task);
-		static ::Dynamic work_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace _Worker
-
-#endif /* INCLUDED_tink_io__Worker_Worker_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/std/InputSource.h b/Sources/c_snikket/iinclude/include/tink/io/std/InputSource.h
deleted file mode 100644
index 0a66a9d..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/std/InputSource.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_std_InputSource
-#define INCLUDED_tink_io_std_InputSource
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_Generator
-#include <tink/streams/Generator.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Bytes)
-HX_DECLARE_CLASS2(haxe,io,Input)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-HX_DECLARE_CLASS3(tink,io,std,InputSource)
-HX_DECLARE_CLASS2(tink,streams,Generator)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-namespace std{
-
-
-class HXCPP_CLASS_ATTRIBUTES InputSource_obj : public  ::tink::streams::Generator_obj
-{
-	public:
-		typedef  ::tink::streams::Generator_obj super;
-		typedef InputSource_obj OBJ_;
-		InputSource_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0f2d2d9e };
-
-		void __construct(::String name, ::haxe::io::Input target,::Dynamic worker, ::haxe::io::Bytes buf,int offset);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.io.std.InputSource")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.io.std.InputSource"); }
-		static ::hx::ObjectPtr< InputSource_obj > __new(::String name, ::haxe::io::Input target,::Dynamic worker, ::haxe::io::Bytes buf,int offset);
-		static ::hx::ObjectPtr< InputSource_obj > __alloc(::hx::Ctx *_hx_ctx,::String name, ::haxe::io::Input target,::Dynamic worker, ::haxe::io::Bytes buf,int offset);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~InputSource_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("InputSource",65,24,98,0b); }
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace std
-
-#endif /* INCLUDED_tink_io_std_InputSource */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/io/std/OutputSink.h b/Sources/c_snikket/iinclude/include/tink/io/std/OutputSink.h
deleted file mode 100644
index 56470b3..0000000
--- a/Sources/c_snikket/iinclude/include/tink/io/std/OutputSink.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_io_std_OutputSink
-#define INCLUDED_tink_io_std_OutputSink
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_io_SinkBase
-#include <tink/io/SinkBase.h>
-#endif
-HX_DECLARE_CLASS2(haxe,io,Output)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,io,SinkBase)
-HX_DECLARE_CLASS2(tink,io,SinkObject)
-HX_DECLARE_CLASS2(tink,io,WorkerObject)
-HX_DECLARE_CLASS3(tink,io,std,OutputSink)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace io{
-namespace std{
-
-
-class HXCPP_CLASS_ATTRIBUTES OutputSink_obj : public  ::tink::io::SinkBase_obj
-{
-	public:
-		typedef  ::tink::io::SinkBase_obj super;
-		typedef OutputSink_obj OBJ_;
-		OutputSink_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1eacaafb };
-
-		void __construct(::String name, ::haxe::io::Output target,::Dynamic worker);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.io.std.OutputSink")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.io.std.OutputSink"); }
-		static ::hx::ObjectPtr< OutputSink_obj > __new(::String name, ::haxe::io::Output target,::Dynamic worker);
-		static ::hx::ObjectPtr< OutputSink_obj > __alloc(::hx::Ctx *_hx_ctx,::String name, ::haxe::io::Output target,::Dynamic worker);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~OutputSink_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("OutputSink",14,ea,f8,a4); }
-
-		::String name;
-		 ::haxe::io::Output target;
-		::Dynamic worker;
-		 ::tink::core::_Future::FutureObject consume(::Dynamic source, ::Dynamic options);
-
-};
-
-} // end namespace tink
-} // end namespace io
-} // end namespace std
-
-#endif /* INCLUDED_tink_io_std_OutputSink */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Conclusion.h b/Sources/c_snikket/iinclude/include/tink/streams/Conclusion.h
deleted file mode 100644
index 94b9893..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Conclusion.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Conclusion
-#define INCLUDED_tink_streams_Conclusion
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,Conclusion)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace streams{
-
-
-class Conclusion_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Conclusion_obj OBJ_;
-
-	public:
-		Conclusion_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.Conclusion",96,99,43,ae); }
-		::String __ToString() const { return HX_("Conclusion.",4f,54,5d,ac) + _hx_tag; }
-
-		static ::tink::streams::Conclusion Clogged( ::tink::core::TypedError error,::Dynamic at);
-		static ::Dynamic Clogged_dyn();
-		static ::tink::streams::Conclusion Depleted;
-		static inline ::tink::streams::Conclusion Depleted_dyn() { return Depleted; }
-		static ::tink::streams::Conclusion Failed( ::tink::core::TypedError error);
-		static ::Dynamic Failed_dyn();
-		static ::tink::streams::Conclusion Halted(::Dynamic rest);
-		static ::Dynamic Halted_dyn();
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Conclusion */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Empty.h b/Sources/c_snikket/iinclude/include/tink/streams/Empty.h
deleted file mode 100644
index c56d215..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Empty.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Empty
-#define INCLUDED_tink_streams_Empty
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,Empty)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES Empty_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef Empty_obj OBJ_;
-		Empty_obj();
-
-	public:
-		enum { _hx_ClassId = 0x0b521554 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams.Empty")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams.Empty"); }
-		static ::hx::ObjectPtr< Empty_obj > __new();
-		static ::hx::ObjectPtr< Empty_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Empty_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static bool __SetStatic(const ::String &inString, Dynamic &ioValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Empty",6d,aa,07,03); }
-
-		static void __boot();
-		static  ::tink::streams::Empty inst;
-		static ::Dynamic make();
-		static ::Dynamic make_dyn();
-
-		bool get_depleted();
-
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Empty */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/FutureStream.h b/Sources/c_snikket/iinclude/include/tink/streams/FutureStream.h
deleted file mode 100644
index 6e2ba9d..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/FutureStream.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_FutureStream
-#define INCLUDED_tink_streams_FutureStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,FutureStream)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES FutureStream_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef FutureStream_obj OBJ_;
-		FutureStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x04fe513c };
-
-		void __construct( ::tink::core::_Future::FutureObject f);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams.FutureStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams.FutureStream"); }
-		static ::hx::ObjectPtr< FutureStream_obj > __new( ::tink::core::_Future::FutureObject f);
-		static ::hx::ObjectPtr< FutureStream_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::core::_Future::FutureObject f);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~FutureStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("FutureStream",43,81,42,90); }
-
-		 ::tink::core::_Future::FutureObject f;
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_FutureStream */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Generator.h b/Sources/c_snikket/iinclude/include/tink/streams/Generator.h
deleted file mode 100644
index 62a0082..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Generator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Generator
-#define INCLUDED_tink_streams_Generator
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,Generator)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES Generator_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef Generator_obj OBJ_;
-		Generator_obj();
-
-	public:
-		enum { _hx_ClassId = 0x50a767d2 };
-
-		void __construct( ::tink::core::_Future::FutureObject upcoming);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams.Generator")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams.Generator"); }
-		static ::hx::ObjectPtr< Generator_obj > __new( ::tink::core::_Future::FutureObject upcoming);
-		static ::hx::ObjectPtr< Generator_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::core::_Future::FutureObject upcoming);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Generator_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Generator",33,d8,43,36); }
-
-		 ::tink::core::_Future::FutureObject upcoming;
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Generator */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Handled.h b/Sources/c_snikket/iinclude/include/tink/streams/Handled.h
deleted file mode 100644
index f35f350..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Handled.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Handled
-#define INCLUDED_tink_streams_Handled
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,Handled)
-namespace tink{
-namespace streams{
-
-
-class Handled_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Handled_obj OBJ_;
-
-	public:
-		Handled_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.Handled",a5,94,ee,d9); }
-		::String __ToString() const { return HX_("Handled.",12,d1,d5,ae) + _hx_tag; }
-
-		static ::tink::streams::Handled BackOff;
-		static inline ::tink::streams::Handled BackOff_dyn() { return BackOff; }
-		static ::tink::streams::Handled Clog( ::tink::core::TypedError e);
-		static ::Dynamic Clog_dyn();
-		static ::tink::streams::Handled Finish;
-		static inline ::tink::streams::Handled Finish_dyn() { return Finish; }
-		static ::tink::streams::Handled Resume;
-		static inline ::tink::streams::Handled Resume_dyn() { return Resume; }
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Handled */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/IdealStreamBase.h b/Sources/c_snikket/iinclude/include/tink/streams/IdealStreamBase.h
deleted file mode 100644
index 6d2b2da..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/IdealStreamBase.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_IdealStreamBase
-#define INCLUDED_tink_streams_IdealStreamBase
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,IdealStreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES IdealStreamBase_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef IdealStreamBase_obj OBJ_;
-		IdealStreamBase_obj();
-
-	public:
-		enum { _hx_ClassId = 0x79ca79c9 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams.IdealStreamBase")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams.IdealStreamBase"); }
-		static ::hx::ObjectPtr< IdealStreamBase_obj > __new();
-		static ::hx::ObjectPtr< IdealStreamBase_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IdealStreamBase_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IdealStreamBase",86,d8,f0,d8); }
-
-		::Dynamic idealize( ::Dynamic _tmp_rescue);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_IdealStreamBase */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/IdealizeStream.h b/Sources/c_snikket/iinclude/include/tink/streams/IdealizeStream.h
deleted file mode 100644
index ef12b38..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/IdealizeStream.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_IdealizeStream
-#define INCLUDED_tink_streams_IdealizeStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_IdealStreamBase
-#include <tink/streams/IdealStreamBase.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,IdealStreamBase)
-HX_DECLARE_CLASS2(tink,streams,IdealizeStream)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES IdealizeStream_obj : public  ::tink::streams::IdealStreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::IdealStreamBase_obj super;
-		typedef IdealizeStream_obj OBJ_;
-		IdealizeStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x15b188e0 };
-
-		void __construct(::Dynamic target, ::Dynamic rescue);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams.IdealizeStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams.IdealizeStream"); }
-		static ::hx::ObjectPtr< IdealizeStream_obj > __new(::Dynamic target, ::Dynamic rescue);
-		static ::hx::ObjectPtr< IdealizeStream_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic target, ::Dynamic rescue);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~IdealizeStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("IdealizeStream",df,18,9d,1b); }
-
-		::Dynamic target;
-		 ::Dynamic rescue;
-		Dynamic rescue_dyn() { return rescue;}
-		bool get_depleted();
-
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_IdealizeStream */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Reduction.h b/Sources/c_snikket/iinclude/include/tink/streams/Reduction.h
deleted file mode 100644
index 5d8fe33..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Reduction.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Reduction
-#define INCLUDED_tink_streams_Reduction
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,Reduction)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace streams{
-
-
-class Reduction_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Reduction_obj OBJ_;
-
-	public:
-		Reduction_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.Reduction",5c,50,fe,4b); }
-		::String __ToString() const { return HX_("Reduction.",bb,b1,a8,cf) + _hx_tag; }
-
-		static ::tink::streams::Reduction Crashed( ::tink::core::TypedError error,::Dynamic at);
-		static ::Dynamic Crashed_dyn();
-		static ::tink::streams::Reduction Failed( ::tink::core::TypedError error);
-		static ::Dynamic Failed_dyn();
-		static ::tink::streams::Reduction Reduced( ::Dynamic result);
-		static ::Dynamic Reduced_dyn();
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Reduction */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/ReductionStep.h b/Sources/c_snikket/iinclude/include/tink/streams/ReductionStep.h
deleted file mode 100644
index a20fdfd..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/ReductionStep.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_ReductionStep
-#define INCLUDED_tink_streams_ReductionStep
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,ReductionStep)
-namespace tink{
-namespace streams{
-
-
-class ReductionStep_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef ReductionStep_obj OBJ_;
-
-	public:
-		ReductionStep_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.ReductionStep",c8,c1,78,61); }
-		::String __ToString() const { return HX_("ReductionStep.",4f,e7,10,f7) + _hx_tag; }
-
-		static ::tink::streams::ReductionStep Crash( ::tink::core::TypedError e);
-		static ::Dynamic Crash_dyn();
-		static ::tink::streams::ReductionStep Progress( ::Dynamic result);
-		static ::Dynamic Progress_dyn();
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_ReductionStep */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/RegroupResult.h b/Sources/c_snikket/iinclude/include/tink/streams/RegroupResult.h
deleted file mode 100644
index d8b27a2..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/RegroupResult.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_RegroupResult
-#define INCLUDED_tink_streams_RegroupResult
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(haxe,ds,Option)
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,RegroupResult)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace streams{
-
-
-class RegroupResult_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef RegroupResult_obj OBJ_;
-
-	public:
-		RegroupResult_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.RegroupResult",52,26,01,31); }
-		::String __ToString() const { return HX_("RegroupResult.",85,7b,e0,be) + _hx_tag; }
-
-		static ::tink::streams::RegroupResult Converted(::Dynamic data,::cpp::VirtualArray untouched);
-		static ::Dynamic Converted_dyn();
-		static ::tink::streams::RegroupResult Errored( ::tink::core::TypedError e);
-		static ::Dynamic Errored_dyn();
-		static ::tink::streams::RegroupResult Terminated( ::haxe::ds::Option data);
-		static ::Dynamic Terminated_dyn();
-		static ::tink::streams::RegroupResult Untouched;
-		static inline ::tink::streams::RegroupResult Untouched_dyn() { return Untouched; }
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_RegroupResult */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/RegroupStatus.h b/Sources/c_snikket/iinclude/include/tink/streams/RegroupStatus.h
deleted file mode 100644
index 7177b22..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/RegroupStatus.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_RegroupStatus
-#define INCLUDED_tink_streams_RegroupStatus
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,RegroupStatus)
-namespace tink{
-namespace streams{
-
-
-class RegroupStatus_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef RegroupStatus_obj OBJ_;
-
-	public:
-		RegroupStatus_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.RegroupStatus",a7,a4,78,2e); }
-		::String __ToString() const { return HX_("RegroupStatus.",90,87,f7,89) + _hx_tag; }
-
-		static ::tink::streams::RegroupStatus Ended;
-		static inline ::tink::streams::RegroupStatus Ended_dyn() { return Ended; }
-		static ::tink::streams::RegroupStatus Errored( ::tink::core::TypedError e);
-		static ::Dynamic Errored_dyn();
-		static ::tink::streams::RegroupStatus Flowing;
-		static inline ::tink::streams::RegroupStatus Flowing_dyn() { return Flowing; }
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_RegroupStatus */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Single.h b/Sources/c_snikket/iinclude/include/tink/streams/Single.h
deleted file mode 100644
index fc74928..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Single.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Single
-#define INCLUDED_tink_streams_Single
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS3(tink,core,_Lazy,Computable)
-HX_DECLARE_CLASS3(tink,core,_Lazy,LazyObject)
-HX_DECLARE_CLASS2(tink,streams,Single)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES Single_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef Single_obj OBJ_;
-		Single_obj();
-
-	public:
-		enum { _hx_ClassId = 0x2688f9e1 };
-
-		void __construct(::Dynamic value);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams.Single")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams.Single"); }
-		static ::hx::ObjectPtr< Single_obj > __new(::Dynamic value);
-		static ::hx::ObjectPtr< Single_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic value);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Single_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Single",a8,da,b5,ed); }
-
-		::Dynamic value;
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handle);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Single */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/Step.h b/Sources/c_snikket/iinclude/include/tink/streams/Step.h
deleted file mode 100644
index e200806..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/Step.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_Step
-#define INCLUDED_tink_streams_Step
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS2(tink,streams,Step)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-namespace tink{
-namespace streams{
-
-
-class Step_obj : public ::hx::EnumBase_obj
-{
-	typedef ::hx::EnumBase_obj super;
-		typedef Step_obj OBJ_;
-
-	public:
-		Step_obj() {};
-		HX_DO_ENUM_RTTI;
-		static void __boot();
-		static void __register();
-		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::String GetEnumName( ) const { return HX_("tink.streams.Step",c3,c6,00,cc); }
-		::String __ToString() const { return HX_("Step.",42,eb,3b,17) + _hx_tag; }
-
-		static ::tink::streams::Step End;
-		static inline ::tink::streams::Step End_dyn() { return End; }
-		static ::tink::streams::Step Fail( ::tink::core::TypedError e);
-		static ::Dynamic Fail_dyn();
-		static ::tink::streams::Step Link( ::Dynamic value,::Dynamic next);
-		static ::Dynamic Link_dyn();
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_Step */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/StreamBase.h b/Sources/c_snikket/iinclude/include/tink/streams/StreamBase.h
deleted file mode 100644
index 92259cf..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/StreamBase.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_StreamBase
-#define INCLUDED_tink_streams_StreamBase
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamObject
-#include <tink/streams/StreamObject.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES StreamBase_obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef StreamBase_obj OBJ_;
-		StreamBase_obj();
-
-	public:
-		enum { _hx_ClassId = 0x61521c8a };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams.StreamBase")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams.StreamBase"); }
-		static ::hx::ObjectPtr< StreamBase_obj > __new();
-		static ::hx::ObjectPtr< StreamBase_obj > __alloc(::hx::Ctx *_hx_ctx);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~StreamBase_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		void *_hx_getInterface(int inHash);
-		::String __ToString() const { return HX_("StreamBase",d1,6c,2c,85); }
-
-		virtual bool get_depleted();
-		::Dynamic get_depleted_dyn();
-
-		::Dynamic regroup( ::Dynamic f);
-		::Dynamic regroup_dyn();
-
-		::Dynamic prepend(::Dynamic other);
-		::Dynamic prepend_dyn();
-
-		virtual void decompose(::Array< ::Dynamic> into);
-		::Dynamic decompose_dyn();
-
-		virtual ::Dynamic idealize( ::Dynamic rescue);
-		::Dynamic idealize_dyn();
-
-		 ::tink::core::_Future::FutureObject reduce( ::Dynamic initial, ::Dynamic reducer);
-		::Dynamic reduce_dyn();
-
-		virtual  ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-		::Dynamic forEach_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_StreamBase */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/StreamObject.h b/Sources/c_snikket/iinclude/include/tink/streams/StreamObject.h
deleted file mode 100644
index 5a2bbc9..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/StreamObject.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams_StreamObject
-#define INCLUDED_tink_streams_StreamObject
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-
-namespace tink{
-namespace streams{
-
-
-class HXCPP_CLASS_ATTRIBUTES StreamObject_obj {
-	public:
-		typedef ::hx::Object super;
-		HX_DO_INTERFACE_RTTI;
-
-		bool (::hx::Object :: *_hx_get_depleted)(); 
-		static inline bool get_depleted( ::Dynamic _hx_) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_get_depleted)();
-		}
-		::Dynamic (::hx::Object :: *_hx_regroup)( ::Dynamic f); 
-		static inline ::Dynamic regroup( ::Dynamic _hx_, ::Dynamic f) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_regroup)(f);
-		}
-		::Dynamic (::hx::Object :: *_hx_idealize)( ::Dynamic rescue); 
-		static inline ::Dynamic idealize( ::Dynamic _hx_, ::Dynamic rescue) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_idealize)(rescue);
-		}
-		::Dynamic (::hx::Object :: *_hx_prepend)(::Dynamic other); 
-		static inline ::Dynamic prepend( ::Dynamic _hx_,::Dynamic other) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_prepend)(other);
-		}
-		void (::hx::Object :: *_hx_decompose)(::Array< ::Dynamic> into); 
-		static inline void decompose( ::Dynamic _hx_,::Array< ::Dynamic> into) {
-			(_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_decompose)(into);
-		}
-		 ::tink::core::_Future::FutureObject (::hx::Object :: *_hx_forEach)( ::Dynamic handle); 
-		static inline  ::tink::core::_Future::FutureObject forEach( ::Dynamic _hx_, ::Dynamic handle) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_forEach)(handle);
-		}
-		 ::tink::core::_Future::FutureObject (::hx::Object :: *_hx_reduce)( ::Dynamic initial, ::Dynamic reducer); 
-		static inline  ::tink::core::_Future::FutureObject reduce( ::Dynamic _hx_, ::Dynamic initial, ::Dynamic reducer) {
-			return (_hx_.mPtr->*( ::hx::interface_cast< ::tink::streams::StreamObject_obj *>(_hx_.mPtr->_hx_getInterface(0x6164ac00)))->_hx_reduce)(initial,reducer);
-		}
-};
-
-} // end namespace tink
-} // end namespace streams
-
-#endif /* INCLUDED_tink_streams_StreamObject */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/CompoundStream.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/CompoundStream.h
deleted file mode 100644
index 529a9c5..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/CompoundStream.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_CompoundStream
-#define INCLUDED_tink_streams__Stream_CompoundStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,Conclusion)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-HX_DECLARE_CLASS3(tink,streams,_Stream,CompoundStream)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES CompoundStream_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef CompoundStream_obj OBJ_;
-		CompoundStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x56b49549 };
-
-		void __construct(::Array< ::Dynamic> parts);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams._Stream.CompoundStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams._Stream.CompoundStream"); }
-		static ::hx::ObjectPtr< CompoundStream_obj > __new(::Array< ::Dynamic> parts);
-		static ::hx::ObjectPtr< CompoundStream_obj > __alloc(::hx::Ctx *_hx_ctx,::Array< ::Dynamic> parts);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~CompoundStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("CompoundStream",6b,c2,13,72); }
-
-		static void consumeParts(::Array< ::Dynamic> parts, ::Dynamic handler, ::Dynamic cb);
-		static ::Dynamic consumeParts_dyn();
-
-		static ::Dynamic of(::Array< ::Dynamic> streams);
-		static ::Dynamic of_dyn();
-
-		::Array< ::Dynamic> parts;
-		bool get_depleted();
-
-		void decompose(::Array< ::Dynamic> into);
-
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_CompoundStream */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/ErrorStream.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/ErrorStream.h
deleted file mode 100644
index 609ab95..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/ErrorStream.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_ErrorStream
-#define INCLUDED_tink_streams__Stream_ErrorStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams_StreamBase
-#include <tink/streams/StreamBase.h>
-#endif
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-HX_DECLARE_CLASS3(tink,streams,_Stream,ErrorStream)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES ErrorStream_obj : public  ::tink::streams::StreamBase_obj
-{
-	public:
-		typedef  ::tink::streams::StreamBase_obj super;
-		typedef ErrorStream_obj OBJ_;
-		ErrorStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1afcc8aa };
-
-		void __construct( ::tink::core::TypedError error);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams._Stream.ErrorStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams._Stream.ErrorStream"); }
-		static ::hx::ObjectPtr< ErrorStream_obj > __new( ::tink::core::TypedError error);
-		static ::hx::ObjectPtr< ErrorStream_obj > __alloc(::hx::Ctx *_hx_ctx, ::tink::core::TypedError error);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~ErrorStream_obj();
-
-		HX_DO_RTTI_ALL;
-		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
-		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
-		void __GetFields(Array< ::String> &outFields);
-		static void __register();
-		void __Mark(HX_MARK_PARAMS);
-		void __Visit(HX_VISIT_PARAMS);
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("ErrorStream",48,f2,cc,e3); }
-
-		 ::tink::core::TypedError error;
-		 ::tink::core::_Future::FutureObject forEach( ::Dynamic handler);
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_ErrorStream */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Handler_Impl_.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Handler_Impl_.h
deleted file mode 100644
index 2e0cf9a..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Handler_Impl_.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_Handler_Impl_
-#define INCLUDED_tink_streams__Stream_Handler_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,Handled)
-HX_DECLARE_CLASS3(tink,streams,_Stream,Handler_Impl_)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES Handler_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Handler_Impl__obj OBJ_;
-		Handler_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x065ceae4 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams._Stream.Handler_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams._Stream.Handler_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Handler_Impl__obj > __new() {
-			::hx::ObjectPtr< Handler_Impl__obj > __this = new Handler_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Handler_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Handler_Impl__obj *__this = (Handler_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Handler_Impl__obj), false, "tink.streams._Stream.Handler_Impl_"));
-			*(void **)__this = Handler_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Handler_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Handler_Impl_",ca,2f,2c,64); }
-
-		static  ::Dynamic ofSafeSync( ::Dynamic f);
-		static ::Dynamic ofSafeSync_dyn();
-
-		static  ::Dynamic ofUnknown( ::Dynamic f);
-		static ::Dynamic ofUnknown_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_Handler_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Reducer_Impl_.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Reducer_Impl_.h
deleted file mode 100644
index 3308ef5..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Reducer_Impl_.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_Reducer_Impl_
-#define INCLUDED_tink_streams__Stream_Reducer_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,ReductionStep)
-HX_DECLARE_CLASS3(tink,streams,_Stream,Reducer_Impl_)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES Reducer_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Reducer_Impl__obj OBJ_;
-		Reducer_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x18a49ca6 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams._Stream.Reducer_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams._Stream.Reducer_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Reducer_Impl__obj > __new() {
-			::hx::ObjectPtr< Reducer_Impl__obj > __this = new Reducer_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Reducer_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Reducer_Impl__obj *__this = (Reducer_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Reducer_Impl__obj), false, "tink.streams._Stream.Reducer_Impl_"));
-			*(void **)__this = Reducer_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Reducer_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Reducer_Impl_",8c,e1,73,76); }
-
-		static  ::Dynamic ofSafeSync( ::Dynamic f);
-		static ::Dynamic ofSafeSync_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_Reducer_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/RegroupStream.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/RegroupStream.h
deleted file mode 100644
index b268759..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/RegroupStream.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_RegroupStream
-#define INCLUDED_tink_streams__Stream_RegroupStream
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-#ifndef INCLUDED_tink_streams__Stream_CompoundStream
-#include <tink/streams/_Stream/CompoundStream.h>
-#endif
-HX_DECLARE_CLASS2(tink,streams,StreamBase)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-HX_DECLARE_CLASS3(tink,streams,_Stream,CompoundStream)
-HX_DECLARE_CLASS3(tink,streams,_Stream,RegroupStream)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES RegroupStream_obj : public  ::tink::streams::_Stream::CompoundStream_obj
-{
-	public:
-		typedef  ::tink::streams::_Stream::CompoundStream_obj super;
-		typedef RegroupStream_obj OBJ_;
-		RegroupStream_obj();
-
-	public:
-		enum { _hx_ClassId = 0x1850db0e };
-
-		void __construct(::Dynamic source, ::Dynamic f,::Dynamic prev,::cpp::VirtualArray buf);
-		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="tink.streams._Stream.RegroupStream")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,true,"tink.streams._Stream.RegroupStream"); }
-		static ::hx::ObjectPtr< RegroupStream_obj > __new(::Dynamic source, ::Dynamic f,::Dynamic prev,::cpp::VirtualArray buf);
-		static ::hx::ObjectPtr< RegroupStream_obj > __alloc(::hx::Ctx *_hx_ctx,::Dynamic source, ::Dynamic f,::Dynamic prev,::cpp::VirtualArray buf);
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~RegroupStream_obj();
-
-		HX_DO_RTTI_ALL;
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("RegroupStream",2c,28,b5,d4); }
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_RegroupStream */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Regrouper_Impl_.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Regrouper_Impl_.h
deleted file mode 100644
index 72afba4..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Regrouper_Impl_.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_Regrouper_Impl_
-#define INCLUDED_tink_streams__Stream_Regrouper_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,streams,RegroupResult)
-HX_DECLARE_CLASS3(tink,streams,_Stream,Regrouper_Impl_)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES Regrouper_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Regrouper_Impl__obj OBJ_;
-		Regrouper_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x74da6ebb };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams._Stream.Regrouper_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams._Stream.Regrouper_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Regrouper_Impl__obj > __new() {
-			::hx::ObjectPtr< Regrouper_Impl__obj > __this = new Regrouper_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Regrouper_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Regrouper_Impl__obj *__this = (Regrouper_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Regrouper_Impl__obj), false, "tink.streams._Stream.Regrouper_Impl_"));
-			*(void **)__this = Regrouper_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Regrouper_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Regrouper_Impl_",59,bf,c2,4c); }
-
-		static  ::Dynamic ofIgnoranceSync( ::Dynamic f);
-		static ::Dynamic ofIgnoranceSync_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_Regrouper_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Stream_Impl_.h b/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Stream_Impl_.h
deleted file mode 100644
index 776c5cc..0000000
--- a/Sources/c_snikket/iinclude/include/tink/streams/_Stream/Stream_Impl_.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_streams__Stream_Stream_Impl_
-#define INCLUDED_tink_streams__Stream_Stream_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS2(tink,core,TypedError)
-HX_DECLARE_CLASS3(tink,core,_Future,FutureObject)
-HX_DECLARE_CLASS2(tink,streams,StreamObject)
-HX_DECLARE_CLASS3(tink,streams,_Stream,Stream_Impl_)
-
-namespace tink{
-namespace streams{
-namespace _Stream{
-
-
-class HXCPP_CLASS_ATTRIBUTES Stream_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Stream_Impl__obj OBJ_;
-		Stream_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x5036bc9e };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.streams._Stream.Stream_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.streams._Stream.Stream_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Stream_Impl__obj > __new() {
-			::hx::ObjectPtr< Stream_Impl__obj > __this = new Stream_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Stream_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Stream_Impl__obj *__this = (Stream_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Stream_Impl__obj), false, "tink.streams._Stream.Stream_Impl_"));
-			*(void **)__this = Stream_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Stream_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Stream_Impl_",40,fd,8a,3d); }
-
-		static ::Dynamic single( ::Dynamic i);
-		static ::Dynamic single_dyn();
-
-		static ::Dynamic future( ::tink::core::_Future::FutureObject f);
-		static ::Dynamic future_dyn();
-
-		static ::Dynamic ofError( ::tink::core::TypedError e);
-		static ::Dynamic ofError_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace streams
-} // end namespace _Stream
-
-#endif /* INCLUDED_tink_streams__Stream_Stream_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/url/_Host/Host_Impl_.h b/Sources/c_snikket/iinclude/include/tink/url/_Host/Host_Impl_.h
deleted file mode 100644
index 3db7153..0000000
--- a/Sources/c_snikket/iinclude/include/tink/url/_Host/Host_Impl_.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_url__Host_Host_Impl_
-#define INCLUDED_tink_url__Host_Host_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,url,_Host,Host_Impl_)
-
-namespace tink{
-namespace url{
-namespace _Host{
-
-
-class HXCPP_CLASS_ATTRIBUTES Host_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Host_Impl__obj OBJ_;
-		Host_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x20d53a72 };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.url._Host.Host_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.url._Host.Host_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Host_Impl__obj > __new() {
-			::hx::ObjectPtr< Host_Impl__obj > __this = new Host_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Host_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Host_Impl__obj *__this = (Host_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Host_Impl__obj), false, "tink.url._Host.Host_Impl_"));
-			*(void **)__this = Host_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Host_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Host_Impl_",28,8e,8a,61); }
-
-		static ::String _new(::String name, ::Dynamic port);
-		static ::Dynamic _new_dyn();
-
-		static ::String get_name(::String this1);
-		static ::Dynamic get_name_dyn();
-
-		static  ::Dynamic get_port(::String this1);
-		static ::Dynamic get_port_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace url
-} // end namespace _Host
-
-#endif /* INCLUDED_tink_url__Host_Host_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/include/tink/url/_Path/Path_Impl_.h b/Sources/c_snikket/iinclude/include/tink/url/_Path/Path_Impl_.h
deleted file mode 100644
index 25b6b43..0000000
--- a/Sources/c_snikket/iinclude/include/tink/url/_Path/Path_Impl_.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by Haxe 4.3.3
-#ifndef INCLUDED_tink_url__Path_Path_Impl_
-#define INCLUDED_tink_url__Path_Path_Impl_
-
-#ifndef HXCPP_H
-#include <hxcpp.h>
-#endif
-
-HX_DECLARE_CLASS3(tink,url,_Path,Path_Impl_)
-
-namespace tink{
-namespace url{
-namespace _Path{
-
-
-class HXCPP_CLASS_ATTRIBUTES Path_Impl__obj : public ::hx::Object
-{
-	public:
-		typedef ::hx::Object super;
-		typedef Path_Impl__obj OBJ_;
-		Path_Impl__obj();
-
-	public:
-		enum { _hx_ClassId = 0x718c1a2c };
-
-		void __construct();
-		inline void *operator new(size_t inSize, bool inContainer=false,const char *inName="tink.url._Path.Path_Impl_")
-			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
-		inline void *operator new(size_t inSize, int extra)
-			{ return ::hx::Object::operator new(inSize+extra,false,"tink.url._Path.Path_Impl_"); }
-
-		inline static ::hx::ObjectPtr< Path_Impl__obj > __new() {
-			::hx::ObjectPtr< Path_Impl__obj > __this = new Path_Impl__obj();
-			__this->__construct();
-			return __this;
-		}
-
-		inline static ::hx::ObjectPtr< Path_Impl__obj > __alloc(::hx::Ctx *_hx_ctx) {
-			Path_Impl__obj *__this = (Path_Impl__obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Path_Impl__obj), false, "tink.url._Path.Path_Impl_"));
-			*(void **)__this = Path_Impl__obj::_hx_vtable;
-			return __this;
-		}
-
-		static void * _hx_vtable;
-		static Dynamic __CreateEmpty();
-		static Dynamic __Create(::hx::DynamicArray inArgs);
-		//~Path_Impl__obj();
-
-		HX_DO_RTTI_ALL;
-		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
-		static void __register();
-		bool _hx_isInstanceOf(int inClassId);
-		::String __ToString() const { return HX_("Path_Impl_",25,70,db,20); }
-
-		static ::String join(::String this1,::String that);
-		static ::Dynamic join_dyn();
-
-		static ::String ofString(::String s);
-		static ::Dynamic ofString_dyn();
-
-		static ::String normalize(::String s);
-		static ::Dynamic normalize_dyn();
-
-};
-
-} // end namespace tink
-} // end namespace url
-} // end namespace _Path
-
-#endif /* INCLUDED_tink_url__Path_Path_Impl_ */ 
diff --git a/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h b/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h
index 59b34d0..fec9d77 100644
--- a/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h
+++ b/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h
@@ -61,6 +61,8 @@ class HXCPP_CLASS_ATTRIBUTES XmppStropheStream_obj : public  ::snikket::GenericS
 		bool _hx_isInstanceOf(int inClassId);
 		::String __ToString() const { return HX_("XmppStropheStream",da,d9,8d,8c); }
 
+		static void strophe_fast_token_handler( xmpp_conn_t* conn,const char* token,void* userdata);
+
 		static int strophe_certfail_handler( const xmpp_tlscert_t* cert,const char* err);
 
 		static int strophe_stanza( xmpp_conn_t* conn, xmpp_stanza_t* sstanza,void* userdata);
diff --git a/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp b/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp
index 1b023b3..58c8416 100644
--- a/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp
+++ b/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp
@@ -70,50 +70,54 @@
 #include <sys/thread/_Thread/Thread_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_174_new,"snikket.streams.XmppStropheStream","new",0x50539160,"snikket.streams.XmppStropheStream.new","snikket/streams/XmppStropheStream.hx",174,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_203_newId,"snikket.streams.XmppStropheStream","newId",0xb962e95b,"snikket.streams.XmppStropheStream.newId","snikket/streams/XmppStropheStream.hx",203,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_266_onIq,"snikket.streams.XmppStropheStream","onIq",0xf97b85e7,"snikket.streams.XmppStropheStream.onIq","snikket/streams/XmppStropheStream.hx",266,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_295_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",295,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_293_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",293,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_314_disconnect,"snikket.streams.XmppStropheStream","disconnect",0xaf2ec35c,"snikket.streams.XmppStropheStream.disconnect","snikket/streams/XmppStropheStream.hx",314,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_318_poll,"snikket.streams.XmppStropheStream","poll",0xfa259d3f,"snikket.streams.XmppStropheStream.poll","snikket/streams/XmppStropheStream.hx",318,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_317_poll,"snikket.streams.XmppStropheStream","poll",0xfa259d3f,"snikket.streams.XmppStropheStream.poll","snikket/streams/XmppStropheStream.hx",317,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_354_convertFromStanza,"snikket.streams.XmppStropheStream","convertFromStanza",0x96c3f3d2,"snikket.streams.XmppStropheStream.convertFromStanza","snikket/streams/XmppStropheStream.hx",354,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_380_sendStanza,"snikket.streams.XmppStropheStream","sendStanza",0xed37e45d,"snikket.streams.XmppStropheStream.sendStanza","snikket/streams/XmppStropheStream.hx",380,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_387_finalize,"snikket.streams.XmppStropheStream","finalize",0x297ee49e,"snikket.streams.XmppStropheStream.finalize","snikket/streams/XmppStropheStream.hx",387,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_206_strophe_certfail_handler,"snikket.streams.XmppStropheStream","strophe_certfail_handler",0x0748fefd,"snikket.streams.XmppStropheStream.strophe_certfail_handler","snikket/streams/XmppStropheStream.hx",206,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_223_strophe_stanza,"snikket.streams.XmppStropheStream","strophe_stanza",0xa2c712e5,"snikket.streams.XmppStropheStream.strophe_stanza","snikket/streams/XmppStropheStream.hx",223,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_269_strophe_connect,"snikket.streams.XmppStropheStream","strophe_connect",0xae6ed8fa,"snikket.streams.XmppStropheStream.strophe_connect","snikket/streams/XmppStropheStream.hx",269,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_324_convertToStanza,"snikket.streams.XmppStropheStream","convertToStanza",0x53baabe3,"snikket.streams.XmppStropheStream.convertToStanza","snikket/streams/XmppStropheStream.hx",324,0x06c67012)
+HX_DEFINE_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_193_new,"snikket.streams.XmppStropheStream","new",0x50539160,"snikket.streams.XmppStropheStream.new","snikket/streams/XmppStropheStream.hx",193,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_227_newId,"snikket.streams.XmppStropheStream","newId",0xb962e95b,"snikket.streams.XmppStropheStream.newId","snikket/streams/XmppStropheStream.hx",227,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_295_onIq,"snikket.streams.XmppStropheStream","onIq",0xf97b85e7,"snikket.streams.XmppStropheStream.onIq","snikket/streams/XmppStropheStream.hx",295,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_324_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",324,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_322_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",322,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_349_disconnect,"snikket.streams.XmppStropheStream","disconnect",0xaf2ec35c,"snikket.streams.XmppStropheStream.disconnect","snikket/streams/XmppStropheStream.hx",349,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_353_poll,"snikket.streams.XmppStropheStream","poll",0xfa259d3f,"snikket.streams.XmppStropheStream.poll","snikket/streams/XmppStropheStream.hx",353,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_352_poll,"snikket.streams.XmppStropheStream","poll",0xfa259d3f,"snikket.streams.XmppStropheStream.poll","snikket/streams/XmppStropheStream.hx",352,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_389_convertFromStanza,"snikket.streams.XmppStropheStream","convertFromStanza",0x96c3f3d2,"snikket.streams.XmppStropheStream.convertFromStanza","snikket/streams/XmppStropheStream.hx",389,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_415_sendStanza,"snikket.streams.XmppStropheStream","sendStanza",0xed37e45d,"snikket.streams.XmppStropheStream.sendStanza","snikket/streams/XmppStropheStream.hx",415,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_422_finalize,"snikket.streams.XmppStropheStream","finalize",0x297ee49e,"snikket.streams.XmppStropheStream.finalize","snikket/streams/XmppStropheStream.hx",422,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_230_strophe_fast_token_handler,"snikket.streams.XmppStropheStream","strophe_fast_token_handler",0xfc0a9611,"snikket.streams.XmppStropheStream.strophe_fast_token_handler","snikket/streams/XmppStropheStream.hx",230,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_235_strophe_certfail_handler,"snikket.streams.XmppStropheStream","strophe_certfail_handler",0x0748fefd,"snikket.streams.XmppStropheStream.strophe_certfail_handler","snikket/streams/XmppStropheStream.hx",235,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_252_strophe_stanza,"snikket.streams.XmppStropheStream","strophe_stanza",0xa2c712e5,"snikket.streams.XmppStropheStream.strophe_stanza","snikket/streams/XmppStropheStream.hx",252,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_298_strophe_connect,"snikket.streams.XmppStropheStream","strophe_connect",0xae6ed8fa,"snikket.streams.XmppStropheStream.strophe_connect","snikket/streams/XmppStropheStream.hx",298,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_359_convertToStanza,"snikket.streams.XmppStropheStream","convertToStanza",0x53baabe3,"snikket.streams.XmppStropheStream.convertToStanza","snikket/streams/XmppStropheStream.hx",359,0x06c67012)
 namespace snikket{
 namespace streams{
 
 void XmppStropheStream_obj::__construct(){
-            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_174_new)
-HXLINE( 179)		this->ready = false;
-HXLINE( 178)		this->pending = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 177)		 ::haxe::ds::EnumValueMap _g =  ::haxe::ds::EnumValueMap_obj::__alloc( HX_CTX );
-HXDLIN( 177)		_g->set(::snikket::IqRequestType_obj::Get_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
-HXDLIN( 177)		_g->set(::snikket::IqRequestType_obj::Set_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
-HXDLIN( 177)		this->iqHandlers = _g;
-HXLINE( 182)		super::__construct();
-HXLINE( 183)		xmpp_initialize();
-HXLINE( 184)		xmpp_log_t *logger = NULL;;
-HXLINE( 186)		logger = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);;
-HXLINE( 188)		this->ctx = xmpp_ctx_new(null(),logger);
-HXLINE( 189)		this->conn = xmpp_conn_new(this->ctx);
-HXLINE( 193)		::cpp::Pointer< char > tmp = null();
-HXLINE( 194)		::cpp::Pointer< char > tmp1 = null();
-HXLINE( 195)		::cpp::Pointer< char > tmp2 = null();
-HXLINE( 191)		 xmpp_conn_t* _hx_tmp = this->conn;
-HXLINE( 192)		::cpp::Function< int  ( xmpp_conn_t*, xmpp_stanza_t*,void*) > _hx_tmp1 = ::cpp::Function< int ( xmpp_conn_t*, xmpp_stanza_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_stanza ));
-HXLINE( 193)		::cpp::Pointer< char > tmp3 = tmp;
-HXLINE( 194)		::cpp::Pointer< char > tmp4 = tmp1;
-HXLINE( 195)		::cpp::Pointer< char > tmp5 = tmp2;
-HXLINE( 190)		xmpp_handler_add(_hx_tmp,_hx_tmp1,tmp3,tmp4,tmp5,(void*)this);
-HXLINE( 198)		 xmpp_conn_t* _hx_tmp2 = this->conn;
-HXDLIN( 198)		xmpp_conn_set_certfail_handler(_hx_tmp2,::cpp::Function< int ( const xmpp_tlscert_t*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_certfail_handler )));
-HXLINE( 199)		_hx_add_finalizable(::hx::ObjectPtr<OBJ_>(this),false);
+            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_193_new)
+HXLINE( 198)		this->ready = false;
+HXLINE( 197)		this->pending = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 196)		 ::haxe::ds::EnumValueMap _g =  ::haxe::ds::EnumValueMap_obj::__alloc( HX_CTX );
+HXDLIN( 196)		_g->set(::snikket::IqRequestType_obj::Get_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
+HXDLIN( 196)		_g->set(::snikket::IqRequestType_obj::Set_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
+HXDLIN( 196)		this->iqHandlers = _g;
+HXLINE( 201)		super::__construct();
+HXLINE( 202)		xmpp_initialize();
+HXLINE( 203)		xmpp_log_t *logger = NULL;;
+HXLINE( 205)		logger = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);;
+HXLINE( 207)		this->ctx = xmpp_ctx_new(null(),logger);
+HXLINE( 208)		this->conn = xmpp_conn_new(this->ctx);
+HXLINE( 212)		::cpp::Pointer< char > tmp = null();
+HXLINE( 213)		::cpp::Pointer< char > tmp1 = null();
+HXLINE( 214)		::cpp::Pointer< char > tmp2 = null();
+HXLINE( 210)		 xmpp_conn_t* _hx_tmp = this->conn;
+HXLINE( 211)		::cpp::Function< int  ( xmpp_conn_t*, xmpp_stanza_t*,void*) > _hx_tmp1 = ::cpp::Function< int ( xmpp_conn_t*, xmpp_stanza_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_stanza ));
+HXLINE( 212)		::cpp::Pointer< char > tmp3 = tmp;
+HXLINE( 213)		::cpp::Pointer< char > tmp4 = tmp1;
+HXLINE( 214)		::cpp::Pointer< char > tmp5 = tmp2;
+HXLINE( 209)		xmpp_handler_add(_hx_tmp,_hx_tmp1,tmp3,tmp4,tmp5,(void*)this);
+HXLINE( 218)		 xmpp_conn_t* _hx_tmp2 = this->conn;
+HXLINE( 219)		::cpp::Function< void  ( xmpp_conn_t*,const char*,void*) > _hx_tmp3 = ::cpp::Function< void ( xmpp_conn_t*,const char*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_fast_token_handler ));
+HXLINE( 217)		xmpp_conn_set_fast_token_handler(_hx_tmp2,_hx_tmp3,(void*)this);
+HXLINE( 222)		 xmpp_conn_t* _hx_tmp4 = this->conn;
+HXDLIN( 222)		xmpp_conn_set_certfail_handler(_hx_tmp4,::cpp::Function< int ( const xmpp_tlscert_t*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_certfail_handler )));
+HXLINE( 223)		_hx_add_finalizable(::hx::ObjectPtr<OBJ_>(this),false);
             	}
 
 Dynamic XmppStropheStream_obj::__CreateEmpty() { return new XmppStropheStream_obj; }
@@ -140,217 +144,236 @@ bool XmppStropheStream_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 ::String XmppStropheStream_obj::newId(){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_203_newId)
-HXDLIN( 203)		return ::snikket::ID_obj::_hx_long();
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_227_newId)
+HXDLIN( 227)		return ::snikket::ID_obj::_hx_long();
             	}
 
 
 void XmppStropheStream_obj::onIq( ::snikket::IqRequestType type,::String tag,::String xmlns, ::Dynamic handler){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_266_onIq)
-HXDLIN( 266)		this->iqHandlers->get(type).StaticCast<  ::haxe::ds::StringMap >()->set((((HX_("{",7b,00,00,00) + xmlns) + HX_("}",7d,00,00,00)) + tag),handler);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_295_onIq)
+HXDLIN( 295)		this->iqHandlers->get(type).StaticCast<  ::haxe::ds::StringMap >()->set((((HX_("{",7b,00,00,00) + xmlns) + HX_("}",7d,00,00,00)) + tag),handler);
             	}
 
 
 void XmppStropheStream_obj::connect(::String jid,::Array< unsigned char > sm){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,_gthis) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic event){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_295_connect)
-HXLINE( 296)			 ::snikket::streams::XmppStropheStream o = _gthis;
-HXLINE( 297)			::String pass = ( (::String)(event->__Field(HX_("password",1b,23,d0,48),::hx::paccDynamic)) );
-HXLINE( 298)			::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(pass.c_str());
-HXDLIN( 298)			xmpp_conn_set_pass(_gthis->conn,tmp);
-HXLINE( 301)			::cpp::Pointer< char > tmp1 = null();
-HXLINE( 300)			 xmpp_conn_t* _gthis1 = _gthis->conn;
-HXLINE( 303)			::cpp::Function< void  ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,void*) > _hx_tmp = ::cpp::Function< void ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_connect ));
-HXLINE( 299)			xmpp_connect_client(_gthis1,tmp1,( (unsigned short)(0) ),_hx_tmp,o.GetPtr());
-HXLINE( 307)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_324_connect)
+HXLINE( 325)			 ::snikket::streams::XmppStropheStream o = _gthis;
+HXLINE( 326)			::String pass = ( (::String)(event->__Field(HX_("password",1b,23,d0,48),::hx::paccDynamic)) );
+HXLINE( 327)			if (::hx::IsNotNull( event->__Field(HX_("fastCount",93,fc,67,a5),::hx::paccDynamic) )) {
+HXLINE( 328)				::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(pass.c_str());
+HXDLIN( 328)				xmpp_conn_set_fast(_gthis->conn,tmp,( (int)(event->__Field(HX_("fastCount",93,fc,67,a5),::hx::paccDynamic)) ));
+            			}
+            			else {
+HXLINE( 330)				::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(pass.c_str());
+HXDLIN( 330)				xmpp_conn_set_pass(_gthis->conn,tmp1);
+HXLINE( 331)				::cpp::Pointer< char > tmp2 = null();
+HXDLIN( 331)				xmpp_conn_set_fast(_gthis->conn,tmp2,-1);
+            			}
+HXLINE( 333)			::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(_gthis->clientId.c_str());
+HXDLIN( 333)			xmpp_conn_set_user_agent_id(_gthis->conn,tmp3);
+HXLINE( 336)			::cpp::Pointer< char > tmp4 = null();
+HXLINE( 335)			 xmpp_conn_t* _gthis1 = _gthis->conn;
+HXLINE( 338)			::cpp::Function< void  ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,void*) > _hx_tmp = ::cpp::Function< void ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_connect ));
+HXLINE( 334)			xmpp_connect_client(_gthis1,tmp4,( (unsigned short)(0) ),_hx_tmp,o.GetPtr());
+HXLINE( 342)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_293_connect)
-HXDLIN( 293)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 294)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(jid.c_str());
-HXDLIN( 294)		xmpp_conn_set_jid(this->conn,tmp);
-HXLINE( 295)		this->on(HX_("auth/password",e2,5d,98,00), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 309)		this->trigger(HX_("auth/password-needed",80,f0,74,49), ::Dynamic(::hx::Anon_obj::Create(0)));
-HXLINE( 310)		this->poll();
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_322_connect)
+HXDLIN( 322)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 323)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(jid.c_str());
+HXDLIN( 323)		xmpp_conn_set_jid(this->conn,tmp);
+HXLINE( 324)		this->on(HX_("auth/password",e2,5d,98,00), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 344)		this->trigger(HX_("auth/password-needed",80,f0,74,49), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 345)		this->poll();
             	}
 
 
 void XmppStropheStream_obj::disconnect(){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_314_disconnect)
-HXDLIN( 314)		xmpp_disconnect(this->conn);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_349_disconnect)
+HXDLIN( 349)		xmpp_disconnect(this->conn);
             	}
 
 
 void XmppStropheStream_obj::poll(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,_gthis) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_318_poll)
-HXLINE( 319)			xmpp_run_once(_gthis->ctx,( (::cpp::UInt64)(1) ));
-HXLINE( 320)			_gthis->poll();
+            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_353_poll)
+HXLINE( 354)			xmpp_run_once(_gthis->ctx,( (::cpp::UInt64)(1) ));
+HXLINE( 355)			_gthis->poll();
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_317_poll)
-HXDLIN( 317)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 318)		::sys::thread::_Thread::Thread_Impl__obj::get_events(::sys::thread::_Thread::HaxeThread_obj::current())->run( ::Dynamic(new _hx_Closure_0(_gthis)));
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_352_poll)
+HXDLIN( 352)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 353)		::sys::thread::_Thread::Thread_Impl__obj::get_events(::sys::thread::_Thread::HaxeThread_obj::current())->run( ::Dynamic(new _hx_Closure_0(_gthis)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(XmppStropheStream_obj,poll,(void))
 
  xmpp_stanza_t* XmppStropheStream_obj::convertFromStanza( ::snikket::Stanza el){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_354_convertFromStanza)
-HXLINE( 355)		 xmpp_stanza_t* xml = xmpp_stanza_new(this->ctx);
-HXLINE( 356)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(el->name.c_str());
-HXDLIN( 356)		xmpp_stanza_set_name(xml,tmp);
-HXLINE( 357)		{
-HXLINE( 357)			 ::Dynamic access = el->attr;
-HXDLIN( 357)			 ::Dynamic _g_access = access;
-HXDLIN( 357)			::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
-HXDLIN( 357)			int _g_index = 0;
-HXDLIN( 357)			while((_g_index < _g_keys->length)){
-HXLINE( 357)				_g_index = (_g_index + 1);
-HXDLIN( 357)				::String key = _g_keys->__get((_g_index - 1));
-HXDLIN( 357)				::String attr_value = ( (::String)(::Reflect_obj::field(_g_access,key)) );
-HXDLIN( 357)				::String attr_key = key;
-HXLINE( 358)				::String key1 = attr_key;
-HXLINE( 359)				::String value = attr_value;
-HXLINE( 360)				if (::hx::IsNotNull( value )) {
-HXLINE( 361)					::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(key1.c_str());
-HXDLIN( 361)					::cpp::Pointer< char > tmp2 = cpp::Pointer_obj::fromPointer(value.c_str());
-HXDLIN( 361)					xmpp_stanza_set_attribute(xml,tmp1,tmp2);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_389_convertFromStanza)
+HXLINE( 390)		 xmpp_stanza_t* xml = xmpp_stanza_new(this->ctx);
+HXLINE( 391)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(el->name.c_str());
+HXDLIN( 391)		xmpp_stanza_set_name(xml,tmp);
+HXLINE( 392)		{
+HXLINE( 392)			 ::Dynamic access = el->attr;
+HXDLIN( 392)			 ::Dynamic _g_access = access;
+HXDLIN( 392)			::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
+HXDLIN( 392)			int _g_index = 0;
+HXDLIN( 392)			while((_g_index < _g_keys->length)){
+HXLINE( 392)				_g_index = (_g_index + 1);
+HXDLIN( 392)				::String key = _g_keys->__get((_g_index - 1));
+HXDLIN( 392)				::String attr_value = ( (::String)(::Reflect_obj::field(_g_access,key)) );
+HXDLIN( 392)				::String attr_key = key;
+HXLINE( 393)				::String key1 = attr_key;
+HXLINE( 394)				::String value = attr_value;
+HXLINE( 395)				if (::hx::IsNotNull( value )) {
+HXLINE( 396)					::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(key1.c_str());
+HXDLIN( 396)					::cpp::Pointer< char > tmp2 = cpp::Pointer_obj::fromPointer(value.c_str());
+HXDLIN( 396)					xmpp_stanza_set_attribute(xml,tmp1,tmp2);
             				}
             			}
             		}
-HXLINE( 364)		if ((el->children->length > 0)) {
-HXLINE( 365)			int _g = 0;
-HXDLIN( 365)			::Array< ::Dynamic> _g1 = el->children;
-HXDLIN( 365)			while((_g < _g1->length)){
-HXLINE( 365)				 ::snikket::Node child = _g1->__get(_g).StaticCast<  ::snikket::Node >();
-HXDLIN( 365)				_g = (_g + 1);
-HXLINE( 366)				switch((int)(child->_hx_getIndex())){
+HXLINE( 399)		if ((el->children->length > 0)) {
+HXLINE( 400)			int _g = 0;
+HXDLIN( 400)			::Array< ::Dynamic> _g1 = el->children;
+HXDLIN( 400)			while((_g < _g1->length)){
+HXLINE( 400)				 ::snikket::Node child = _g1->__get(_g).StaticCast<  ::snikket::Node >();
+HXDLIN( 400)				_g = (_g + 1);
+HXLINE( 401)				switch((int)(child->_hx_getIndex())){
             					case (int)0: {
-HXLINE( 367)						 ::snikket::Stanza stanza = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE( 368)						xmpp_stanza_add_child_ex(xml,this->convertFromStanza(stanza),false);
+HXLINE( 402)						 ::snikket::Stanza stanza = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 403)						xmpp_stanza_add_child_ex(xml,this->convertFromStanza(stanza),false);
             					}
             					break;
             					case (int)1: {
-HXLINE( 369)						 ::snikket::TextNode text = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXDLIN( 369)						{
-HXLINE( 370)							 xmpp_stanza_t* text_node = xmpp_stanza_new(this->ctx);
-HXLINE( 371)							::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(text->content.c_str());
-HXDLIN( 371)							xmpp_stanza_set_text(text_node,tmp3);
-HXLINE( 372)							xmpp_stanza_add_child_ex(xml,text_node,false);
+HXLINE( 404)						 ::snikket::TextNode text = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
+HXDLIN( 404)						{
+HXLINE( 405)							 xmpp_stanza_t* text_node = xmpp_stanza_new(this->ctx);
+HXLINE( 406)							::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(text->content.c_str());
+HXDLIN( 406)							xmpp_stanza_set_text(text_node,tmp3);
+HXLINE( 407)							xmpp_stanza_add_child_ex(xml,text_node,false);
             						}
             					}
             					break;
             				}
             			}
             		}
-HXLINE( 376)		return xml;
+HXLINE( 411)		return xml;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(XmppStropheStream_obj,convertFromStanza,return )
 
 void XmppStropheStream_obj::sendStanza( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_380_sendStanza)
-HXDLIN( 380)		if (this->ready) {
-HXLINE( 381)			 xmpp_conn_t* _hx_tmp = this->conn;
-HXDLIN( 381)			xmpp_send(_hx_tmp,this->convertFromStanza(stanza));
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_415_sendStanza)
+HXDLIN( 415)		if (this->ready) {
+HXLINE( 416)			 xmpp_conn_t* _hx_tmp = this->conn;
+HXDLIN( 416)			xmpp_send(_hx_tmp,this->convertFromStanza(stanza));
             		}
             		else {
-HXLINE( 383)			this->pending->push(stanza);
+HXLINE( 418)			this->pending->push(stanza);
             		}
             	}
 
 
 void XmppStropheStream_obj::finalize(){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_387_finalize)
-HXLINE( 388)		xmpp_stop(this->ctx);
-HXLINE( 389)		xmpp_conn_release(this->conn);
-HXLINE( 390)		xmpp_ctx_free(this->ctx);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_422_finalize)
+HXLINE( 423)		xmpp_stop(this->ctx);
+HXLINE( 424)		xmpp_conn_release(this->conn);
+HXLINE( 425)		xmpp_ctx_free(this->ctx);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(XmppStropheStream_obj,finalize,(void))
 
+void XmppStropheStream_obj::strophe_fast_token_handler( xmpp_conn_t* conn,const char* token,void* userdata){
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_230_strophe_fast_token_handler)
+HXLINE( 231)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 232)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(token);
+HXDLIN( 232)		stream->trigger(HX_("fast-token",48,5f,c2,26), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("token",f9,82,2b,14), ::String(inPtr->ptr))));
+            	}
+
+
 int XmppStropheStream_obj::strophe_certfail_handler( const xmpp_tlscert_t* cert,const char* err){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_206_strophe_certfail_handler)
-HXLINE( 207)		 xmpp_conn_t* conn = xmpp_tlscert_get_conn(cert);
-HXLINE( 208)		::Array< ::String > dnsNames = ::Array_obj< ::String >::__new(0);
-HXLINE( 209)		::cpp::Pointer< char > dnsName = null();
-HXLINE( 210)		int dnsNameN = 0;
-HXLINE( 211)		while(true){
-HXLINE( 211)			dnsNameN = (dnsNameN + 1);
-HXDLIN( 211)			dnsName = xmpp_tlscert_get_dnsname(cert,( (size_t)((dnsNameN - 1)) ));
-HXDLIN( 211)			if (!(::hx::IsNotNull( dnsName ))) {
-HXLINE( 211)				goto _hx_goto_13;
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_235_strophe_certfail_handler)
+HXLINE( 236)		 xmpp_conn_t* conn = xmpp_tlscert_get_conn(cert);
+HXLINE( 237)		::Array< ::String > dnsNames = ::Array_obj< ::String >::__new(0);
+HXLINE( 238)		::cpp::Pointer< char > dnsName = null();
+HXLINE( 239)		int dnsNameN = 0;
+HXLINE( 240)		while(true){
+HXLINE( 240)			dnsNameN = (dnsNameN + 1);
+HXDLIN( 240)			dnsName = xmpp_tlscert_get_dnsname(cert,( (size_t)((dnsNameN - 1)) ));
+HXDLIN( 240)			if (!(::hx::IsNotNull( dnsName ))) {
+HXLINE( 240)				goto _hx_goto_14;
             			}
-HXLINE( 212)			dnsNames->push( ::String(dnsName->ptr));
+HXLINE( 241)			dnsNames->push( ::String(dnsName->ptr));
             		}
-            		_hx_goto_13:;
-HXLINE( 214)		return 1;
+            		_hx_goto_14:;
+HXLINE( 243)		return 1;
             	}
 
 
 int XmppStropheStream_obj::strophe_stanza( xmpp_conn_t* conn, xmpp_stanza_t* sstanza,void* userdata){
-            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_223_strophe_stanza)
-HXLINE( 224)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 225)		 ::snikket::Stanza stanza = ::snikket::streams::XmppStropheStream_obj::convertToStanza(sstanza,null());
-HXLINE( 227)		::String xmlns = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("xmlns",dc,31,74,60))) );
-HXLINE( 228)		if ((xmlns == HX_("jabber:client",21,64,c5,e4))) {
-HXLINE( 229)			::String name = stanza->name;
-HXLINE( 230)			if ((name == HX_("iq",e8,5b,00,00))) {
-HXLINE( 231)				::String type = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("type",ba,f2,08,4d))) );
-HXLINE( 232)				bool _hx_tmp;
-HXDLIN( 232)				if ((type != HX_("result",dd,68,84,08))) {
-HXLINE( 232)					_hx_tmp = (type == HX_("error",c8,cb,29,73));
+            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_252_strophe_stanza)
+HXLINE( 253)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 254)		 ::snikket::Stanza stanza = ::snikket::streams::XmppStropheStream_obj::convertToStanza(sstanza,null());
+HXLINE( 256)		::String xmlns = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("xmlns",dc,31,74,60))) );
+HXLINE( 257)		if ((xmlns == HX_("jabber:client",21,64,c5,e4))) {
+HXLINE( 258)			::String name = stanza->name;
+HXLINE( 259)			if ((name == HX_("iq",e8,5b,00,00))) {
+HXLINE( 260)				::String type = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("type",ba,f2,08,4d))) );
+HXLINE( 261)				bool _hx_tmp;
+HXDLIN( 261)				if ((type != HX_("result",dd,68,84,08))) {
+HXLINE( 261)					_hx_tmp = (type == HX_("error",c8,cb,29,73));
             				}
             				else {
-HXLINE( 232)					_hx_tmp = true;
+HXLINE( 261)					_hx_tmp = true;
             				}
-HXDLIN( 232)				if (_hx_tmp) {
-HXLINE( 233)					stream->onStanza(stanza);
+HXDLIN( 261)				if (_hx_tmp) {
+HXLINE( 262)					stream->onStanza(stanza);
             				}
             				else {
-HXLINE( 236)					 ::snikket::Stanza child = stanza->getFirstChild();
-HXLINE( 237)					if (::hx::IsNotNull( child )) {
-HXLINE( 238)						 ::snikket::IqRequestType this1;
-HXDLIN( 238)						if ((type == HX_("get",96,80,4e,00))) {
-HXLINE( 238)							this1 = ::snikket::IqRequestType_obj::Get_dyn();
+HXLINE( 265)					 ::snikket::Stanza child = stanza->getFirstChild();
+HXLINE( 266)					if (::hx::IsNotNull( child )) {
+HXLINE( 267)						 ::snikket::IqRequestType this1;
+HXDLIN( 267)						if ((type == HX_("get",96,80,4e,00))) {
+HXLINE( 267)							this1 = ::snikket::IqRequestType_obj::Get_dyn();
             						}
             						else {
-HXLINE( 238)							this1 = ::snikket::IqRequestType_obj::Set_dyn();
+HXLINE( 267)							this1 = ::snikket::IqRequestType_obj::Set_dyn();
             						}
-HXDLIN( 238)						::Dynamic this2 = stream->iqHandlers->get(this1).StaticCast<  ::haxe::ds::StringMap >();
-HXDLIN( 238)						::String key = ((HX_("{",7b,00,00,00) + ( (::String)(::Reflect_obj::field(child->attr,HX_("xmlns",dc,31,74,60))) )) + HX_("}",7d,00,00,00));
-HXDLIN( 238)						 ::Dynamic handler = ( ( ::haxe::ds::StringMap)(this2) )->get((key + child->name));
-HXLINE( 239)						if (::hx::IsNotNull( handler )) {
-HXLINE( 240)							::String reply = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) );
-HXDLIN( 240)							::String reply1 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
-HXDLIN( 240)							 ::snikket::Stanza reply2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(4)
+HXDLIN( 267)						::Dynamic this2 = stream->iqHandlers->get(this1).StaticCast<  ::haxe::ds::StringMap >();
+HXDLIN( 267)						::String key = ((HX_("{",7b,00,00,00) + ( (::String)(::Reflect_obj::field(child->attr,HX_("xmlns",dc,31,74,60))) )) + HX_("}",7d,00,00,00));
+HXDLIN( 267)						 ::Dynamic handler = ( ( ::haxe::ds::StringMap)(this2) )->get((key + child->name));
+HXLINE( 268)						if (::hx::IsNotNull( handler )) {
+HXLINE( 269)							::String reply = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) );
+HXDLIN( 269)							::String reply1 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
+HXDLIN( 269)							 ::snikket::Stanza reply2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(4)
             								->setFixed(0,HX_("id",db,5b,00,00),( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) ))
             								->setFixed(1,HX_("to",7b,65,00,00),reply1)
             								->setFixed(2,HX_("from",6a,a5,c2,43),reply)
             								->setFixed(3,HX_("type",ba,f2,08,4d),HX_("result",dd,68,84,08))));
-HXLINE( 241)							try {
+HXLINE( 270)							try {
             								HX_STACK_CATCHABLE( ::Dynamic, 0);
-HXLINE( 242)								 ::snikket::IqResult _g = handler(stanza);
-HXDLIN( 242)								switch((int)(_g->_hx_getIndex())){
+HXLINE( 271)								 ::snikket::IqResult _g = handler(stanza);
+HXDLIN( 271)								switch((int)(_g->_hx_getIndex())){
             									case (int)0: {
-HXLINE( 243)										 ::snikket::Stanza el = _g->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 243)										reply2->addChild(el);
+HXLINE( 272)										 ::snikket::Stanza el = _g->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 272)										reply2->addChild(el);
             									}
             									break;
             									case (int)1: {
             									}
             									break;
             									case (int)2: {
-HXLINE( 246)										::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
-HXLINE( 247)										reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 275)										::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
+HXLINE( 276)										reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
             											->setFixed(0,HX_("type",ba,f2,08,4d),HX_("cancel",7a,ed,33,b8))))->tag(HX_("service-unavailable",f8,3c,11,1c), ::Dynamic(::hx::Anon_obj::Create(1)
             											->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30))));
             									}
@@ -360,8 +383,8 @@ HXLINE( 247)										reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon
             								if (_hx_e.IsClass<  ::Dynamic >() ){
             									HX_STACK_BEGIN_CATCH
             									 ::Dynamic _g1 = _hx_e;
-HXLINE( 250)									::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
-HXLINE( 251)									reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 279)									::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
+HXLINE( 280)									reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
             										->setFixed(0,HX_("type",ba,f2,08,4d),HX_("cancel",7a,ed,33,b8))))->tag(HX_("internal-server-error",ce,6d,55,6c), ::Dynamic(::hx::Anon_obj::Create(1)
             										->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30))));
             								}
@@ -369,84 +392,84 @@ HXLINE( 251)									reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_
             									HX_STACK_DO_THROW(_hx_e);
             								}
             							}
-HXLINE( 253)							stream->sendStanza(reply2);
+HXLINE( 282)							stream->sendStanza(reply2);
             						}
             					}
             				}
             			}
             			else {
-HXLINE( 258)				stream->onStanza(stanza);
+HXLINE( 287)				stream->onStanza(stanza);
             			}
             		}
-HXLINE( 262)		return 1;
+HXLINE( 291)		return 1;
             	}
 
 
 void XmppStropheStream_obj::strophe_connect( xmpp_conn_t* conn, xmpp_conn_event_t event,int error, xmpp_stream_error_t* stream_error,void* userdata){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_269_strophe_connect)
-HXLINE( 270)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 271)		if (::hx::IsInstanceEq( event,XMPP_CONN_CONNECT )) {
-HXLINE( 272)			stream->ready = true;
-HXLINE( 273)			while((stream->pending->length > 0)){
-HXLINE( 274)				stream->sendStanza(stream->pending->shift().StaticCast<  ::snikket::Stanza >());
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_298_strophe_connect)
+HXLINE( 299)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 300)		if (::hx::IsInstanceEq( event,XMPP_CONN_CONNECT )) {
+HXLINE( 301)			stream->ready = true;
+HXLINE( 302)			while((stream->pending->length > 0)){
+HXLINE( 303)				stream->sendStanza(stream->pending->shift().StaticCast<  ::snikket::Stanza >());
             			}
-HXLINE( 276)			stream->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 305)			stream->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
             		}
-HXLINE( 278)		if (::hx::IsInstanceEq( event,XMPP_CONN_DISCONNECT )) {
-HXLINE( 279)			if (!(stream->ready)) {
-HXLINE( 281)				stream->trigger(HX_("auth/fail",25,45,e9,d1), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 307)		if (::hx::IsInstanceEq( event,XMPP_CONN_DISCONNECT )) {
+HXLINE( 308)			if (!(stream->ready)) {
+HXLINE( 310)				stream->trigger(HX_("auth/fail",25,45,e9,d1), ::Dynamic(::hx::Anon_obj::Create(0)));
             			}
             			else {
-HXLINE( 283)				stream->ready = false;
-HXLINE( 284)				stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 312)				stream->ready = false;
+HXLINE( 313)				stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
             			}
             		}
-HXLINE( 287)		if (::hx::IsInstanceEq( event,XMPP_CONN_FAIL )) {
-HXLINE( 288)			stream->ready = false;
-HXLINE( 289)			stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 316)		if (::hx::IsInstanceEq( event,XMPP_CONN_FAIL )) {
+HXLINE( 317)			stream->ready = false;
+HXLINE( 318)			stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
             		}
             	}
 
 
  ::snikket::Stanza XmppStropheStream_obj::convertToStanza( xmpp_stanza_t* el,void* dummy){
-            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_324_convertToStanza)
-HXLINE( 325)		::cpp::Pointer< char > name = xmpp_stanza_get_name(el);
-HXLINE( 326)		int attrlen = xmpp_stanza_get_attribute_count(el);
-HXLINE( 327)		void* attrsraw = ::hx::InternalNew(((attrlen * 2) * sizeof(char*)),false);
-HXLINE( 328)		const char** attrsarray = static_cast<const char**>(attrsraw);
-HXLINE( 329)		::cpp::Pointer< const char* > attrsptr = ::cpp::Pointer_obj::fromRaw(attrsarray);
-HXLINE( 330)		xmpp_stanza_get_attributes(el,attrsarray,(attrlen * 2));
-HXLINE( 331)		 ::Dynamic attrs =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE( 332)		{
-HXLINE( 332)			int _g = 0;
-HXDLIN( 332)			int _g1 = attrlen;
-HXDLIN( 332)			while((_g < _g1)){
-HXLINE( 332)				_g = (_g + 1);
-HXDLIN( 332)				int i = (_g - 1);
-HXLINE( 333)				::cpp::Pointer< char > key = cpp::Pointer_obj::fromRaw(attrsptr->at((i * 2)));
-HXLINE( 334)				::cpp::Pointer< char > value = cpp::Pointer_obj::fromRaw(attrsptr->at(((i * 2) + 1)));
-HXLINE( 335)				{
-HXLINE( 335)					::String key1 =  ::String(key->ptr);
-HXDLIN( 335)					::String value1 =  ::String(value->ptr);
-HXDLIN( 335)					::Reflect_obj::setField(attrs,key1,value1);
+            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_359_convertToStanza)
+HXLINE( 360)		::cpp::Pointer< char > name = xmpp_stanza_get_name(el);
+HXLINE( 361)		int attrlen = xmpp_stanza_get_attribute_count(el);
+HXLINE( 362)		void* attrsraw = ::hx::InternalNew(((attrlen * 2) * sizeof(char*)),false);
+HXLINE( 363)		const char** attrsarray = static_cast<const char**>(attrsraw);
+HXLINE( 364)		::cpp::Pointer< const char* > attrsptr = ::cpp::Pointer_obj::fromRaw(attrsarray);
+HXLINE( 365)		xmpp_stanza_get_attributes(el,attrsarray,(attrlen * 2));
+HXLINE( 366)		 ::Dynamic attrs =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE( 367)		{
+HXLINE( 367)			int _g = 0;
+HXDLIN( 367)			int _g1 = attrlen;
+HXDLIN( 367)			while((_g < _g1)){
+HXLINE( 367)				_g = (_g + 1);
+HXDLIN( 367)				int i = (_g - 1);
+HXLINE( 368)				::cpp::Pointer< char > key = cpp::Pointer_obj::fromRaw(attrsptr->at((i * 2)));
+HXLINE( 369)				::cpp::Pointer< char > value = cpp::Pointer_obj::fromRaw(attrsptr->at(((i * 2) + 1)));
+HXLINE( 370)				{
+HXLINE( 370)					::String key1 =  ::String(key->ptr);
+HXDLIN( 370)					::String value1 =  ::String(value->ptr);
+HXDLIN( 370)					::Reflect_obj::setField(attrs,key1,value1);
             				}
             			}
             		}
-HXLINE( 337)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX , ::String(name->ptr),attrs);
-HXLINE( 339)		 xmpp_stanza_t* child = xmpp_stanza_get_children(el);
-HXLINE( 340)		while(::hx::IsNotNull( child )){
-HXLINE( 341)			if (xmpp_stanza_is_text(child)) {
-HXLINE( 342)				const char* r = xmpp_stanza_get_text_ptr(child);
-HXLINE( 343)				::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(xmpp_stanza_get_text_ptr(child));
-HXDLIN( 343)				::String x =  ::String(inPtr->ptr);
-HXLINE( 344)				stanza->text(x);
+HXLINE( 372)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX , ::String(name->ptr),attrs);
+HXLINE( 374)		 xmpp_stanza_t* child = xmpp_stanza_get_children(el);
+HXLINE( 375)		while(::hx::IsNotNull( child )){
+HXLINE( 376)			if (xmpp_stanza_is_text(child)) {
+HXLINE( 377)				const char* r = xmpp_stanza_get_text_ptr(child);
+HXLINE( 378)				::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(xmpp_stanza_get_text_ptr(child));
+HXDLIN( 378)				::String x =  ::String(inPtr->ptr);
+HXLINE( 379)				stanza->text(x);
             			}
             			else {
-HXLINE( 346)				stanza->addChild(::snikket::streams::XmppStropheStream_obj::convertToStanza(child,null()));
+HXLINE( 381)				stanza->addChild(::snikket::streams::XmppStropheStream_obj::convertToStanza(child,null()));
             			}
-HXLINE( 348)			child = xmpp_stanza_get_next(child);
+HXLINE( 383)			child = xmpp_stanza_get_next(child);
             		}
-HXLINE( 351)		return stanza;
+HXLINE( 386)		return stanza;
             	}
 
 
diff --git a/Sources/strophe/libstrophe b/Sources/strophe/libstrophe
index a2b3b6b..2d6b179 160000
--- a/Sources/strophe/libstrophe
+++ b/Sources/strophe/libstrophe
@@ -1 +1 @@
-Subproject commit a2b3b6b9e255bc350c6182cd20bd28c7b289eddb
+Subproject commit 2d6b179774d3e9f13beaa644feb8b01c12bba9a7