a bit of HL renaming

src/generators/genhl.ml

@@ -131,7 +131,7 @@ let is_extern_field f =
 
 let is_array_class name =
 	match name with
-	| "hl.types.ArrayDyn" | "hl.types.ArrayBasic_Int" | "hl.types.ArrayBasic_Float" | "hl.types.ArrayObj" -> true
+	| "hl.types.ArrayDyn" | "hl.types.ArrayBytes_Int" | "hl.types.ArrayBytes_Float" | "hl.types.ArrayObj" | "hl.types.ArrayBytes_Single" | "hl.types.ArrayBytes_hl_UI16" -> true
 	| _ -> false
 
 let is_array_type t =
@@ -387,7 +387,7 @@ let rec to_type ?tref ctx t =
 		HDyn
 	| TEnum (e,_) ->
 		enum_type ~tref ctx e
-	| TInst ({ cl_path = ["hl";"types"],"NativeAbstract" },[TInst({ cl_kind = KExpr (EConst (String name),_) },_)]) ->
+	| TInst ({ cl_path = ["hl"],"Abstract" },[TInst({ cl_kind = KExpr (EConst (String name),_) },_)]) ->
 		HAbstract (name, alloc_string ctx name)
 	| TInst (c,pl) ->
 		(match c.cl_kind with
@@ -415,12 +415,12 @@ let rec to_type ?tref ctx t =
 			| [], "Enum" ->
 				class_type ctx ctx.base_type [] false
 			| [], "EnumValue" -> HDyn
-			| ["hl";"types"], "Ref" -> HRef (to_type ctx (List.hd pl))
-			| ["hl";"types"], ("Bytes" | "BytesAccess") -> HBytes
-			| ["hl";"types"], "Type" -> HType
-			| ["hl";"types"], "UI16" -> HUI16
-			| ["hl";"types"], "UI8" -> HUI8
-			| ["hl";"types"], "NativeArray" -> HArray
+			| ["hl"], "Ref" -> HRef (to_type ctx (List.hd pl))
+			| ["hl"], ("Bytes" | "BytesAccess") -> HBytes
+			| ["hl"], "Type" -> HType
+			| ["hl"], "UI16" -> HUI16
+			| ["hl"], "UI8" -> HUI8
+			| ["hl"], "NativeArray" -> HArray
 			| _ -> failwith ("Unknown core type " ^ s_type_path a.a_path))
 		else
 			to_type ?tref ctx (Abstract.get_underlying_type a pl)
@@ -1492,7 +1492,7 @@ and eval_expr ctx e =
 			r
 		| "$bytes_sizebits", [eb] ->
 			(match follow eb.etype with
-			| TAbstract({a_path = ["hl";"types"],"BytesAccess"},[t]) ->
+			| TAbstract({a_path = ["hl"],"BytesAccess"},[t]) ->
 				reg_int ctx (match to_type ctx t with
 				| HUI8 -> 0
 				| HUI16 -> 1
@@ -1504,7 +1504,7 @@ and eval_expr ctx e =
 				abort "Invalid BytesAccess" eb.epos);
 		| "$bytes_nullvalue", [eb] ->
 			(match follow eb.etype with
-			| TAbstract({a_path = ["hl";"types"],"BytesAccess"},[t]) ->
+			| TAbstract({a_path = ["hl"],"BytesAccess"},[t]) ->
 				let t = to_type ctx t in
 				let r = alloc_tmp ctx t in
 				(match t with
@@ -1519,7 +1519,7 @@ and eval_expr ctx e =
 				abort "Invalid BytesAccess" eb.epos);
 		| "$bget", [eb;pos] ->
 			(match follow eb.etype with
-			| TAbstract({a_path = ["hl";"types"],"BytesAccess"},[t]) ->
+			| TAbstract({a_path = ["hl"],"BytesAccess"},[t]) ->
 				let b = eval_to ctx eb HBytes in
 				hold ctx b;
 				let pos = eval_to ctx pos HI32 in
@@ -1552,7 +1552,7 @@ and eval_expr ctx e =
 				abort "Invalid BytesAccess" eb.epos);
 		| "$bset", [eb;pos;value] ->
 			(match follow eb.etype with
-			| TAbstract({a_path = ["hl";"types"],"BytesAccess"},[t]) ->
+			| TAbstract({a_path = ["hl"],"BytesAccess"},[t]) ->
 				let b = eval_to ctx eb HBytes in
 				hold ctx b;
 				let pos = eval_to ctx pos HI32 in
@@ -1640,7 +1640,7 @@ and eval_expr ctx e =
 			op ctx (OArraySize (r, eval_to ctx e HArray));
 			r
 		| "$aalloc", [esize] ->
-			let et = (match follow e.etype with TAbstract ({ a_path = ["hl";"types"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
+			let et = (match follow e.etype with TAbstract ({ a_path = ["hl"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
 			let size = eval_to ctx esize HI32 in
 			let a = alloc_tmp ctx HArray in
 			let rt = alloc_tmp ctx HType in
@@ -1651,7 +1651,7 @@ and eval_expr ctx e =
 			(*
 				read/write on arrays are unsafe : the type of NativeArray needs to be correcly set.
 			*)
-			let at = (match follow a.etype with TAbstract ({ a_path = ["hl";"types"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
+			let at = (match follow a.etype with TAbstract ({ a_path = ["hl"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
 			let arr = eval_to ctx a HArray in
 			hold ctx arr;
 			let pos = eval_to ctx pos HI32 in
@@ -1660,7 +1660,7 @@ and eval_expr ctx e =
 			op ctx (OGetArray (r, arr, pos));
 			cast_to ctx r (to_type ctx e.etype) e.epos
 		| "$aset", [a; pos; value] ->
-			let et = (match follow a.etype with TAbstract ({ a_path = ["hl";"types"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
+			let et = (match follow a.etype with TAbstract ({ a_path = ["hl"],"NativeArray" },[t]) -> to_type ctx t | _ -> invalid()) in
 			let arr = eval_to ctx a HArray in
 			let pos = eval_to ctx pos HI32 in
 			let r = eval_to ctx value et in
@@ -2453,7 +2453,7 @@ and eval_expr ctx e =
 					let r = type_value ctx ct ec.epos in
 					free ctx rtrap;
 					let rb = alloc_tmp ctx HBool in
-					op ctx (OCall2 (rb, alloc_fun_path ctx (["hl";"types"],"BaseType") "check",r,rtrap));
+					op ctx (OCall2 (rb, alloc_fun_path ctx (["hl"],"BaseType") "check",r,rtrap));
 					let jnext = jump ctx (fun n -> OJFalse (rb,n)) in
 					op ctx (OMov (rv, unsafe_cast_to ctx rtrap (to_type ctx v.v_type) ec.epos));
 					jnext
@@ -3058,7 +3058,7 @@ let generate_static_init ctx =
 				) e.e_names;
 
 				op ctx (OType (rt, (to_type ctx (TEnum (e,List.map snd e.e_params)))));
-				op ctx (OCall3 (alloc_tmp ctx HVoid, alloc_fun_path ctx (["hl";"types"],"Enum") "new",r,rt,avalues));
+				op ctx (OCall3 (alloc_tmp ctx HVoid, alloc_fun_path ctx (["hl"],"Enum") "new",r,rt,avalues));
 
 				(match Codegen.build_metadata ctx.com (TEnumDecl e) with
 				| None -> ()
@@ -3407,6 +3407,8 @@ let write_code ch code debug =
 let generate com =
 	let get_type name =
 		try
+			List.find (fun t -> (t_infos t).mt_path = (["hl"],name)) com.types
+		with Not_found -> try
 			List.find (fun t -> (t_infos t).mt_path = (["hl";"types"],name)) com.types
 		with Not_found ->
 			failwith ("hl type " ^ name ^ " not found")
@@ -3443,10 +3445,10 @@ let generate com =
 			abase = get_class "ArrayBase";
 			adyn = get_class "ArrayDyn";
 			aobj = get_class "ArrayObj";
-			aui16 = get_class "ArrayBasic_hl_types_UI16";
-			ai32 = get_class "ArrayBasic_Int";
-			af32 = get_class "ArrayBasic_Single";
-			af64 = get_class "ArrayBasic_Float";
+			aui16 = get_class "ArrayBytes_hl_UI16";
+			ai32 = get_class "ArrayBytes_Int";
+			af32 = get_class "ArrayBytes_Single";
+			af64 = get_class "ArrayBytes_Float";
 		};
 		base_class = get_class "Class";
 		base_enum = get_class "Enum";
@@ -3462,7 +3464,7 @@ let generate com =
 	let all_classes = Hashtbl.create 0 in
 	List.iter (fun t ->
 		match t with
-		| TClassDecl ({ cl_path = ["hl";"types"], ("BasicIterator"|"ArrayBasic") } as c) ->
+		| TClassDecl ({ cl_path = ["hl";"types"], ("BytesIterator"|"ArrayBytes") } as c) ->
 			c.cl_extern <- true
 		| TClassDecl c ->
 			let rec loop p f =

std/haxe/CallStack.hx

@@ -144,7 +144,7 @@ class CallStack {
 	}
 
 	#if hl
-	@:hlNative("std", "exception_stack") static function _getExceptionStack() : hl.types.NativeArray<hl.types.Bytes> { return null; }
+	@:hlNative("std", "exception_stack") static function _getExceptionStack() : hl.NativeArray<hl.Bytes> { return null; }
 	#end
 
 	/**
@@ -257,7 +257,7 @@ class CallStack {
 	}
 
 	#if cpp @:noStack #end /* Do not mess up the exception stack */
-	private static function makeStack(s #if cs : cs.system.diagnostics.StackTrace #elseif hl : hl.types.NativeArray<hl.types.Bytes> #end) {
+	private static function makeStack(s #if cs : cs.system.diagnostics.StackTrace #elseif hl : hl.NativeArray<hl.Bytes> #end) {
 		#if neko
 			var a = new Array();
 			var l = untyped __dollar__asize(s);

std/haxe/io/BytesData.hx

@@ -39,7 +39,7 @@ package haxe.io;
 	typedef BytesData = js.html.ArrayBuffer;
 #elseif hl
 	class BytesDataImpl {
-		public var bytes : hl.types.Bytes;
+		public var bytes : hl.Bytes;
 		public var length : Int;
 		public function new(b,length) {
 			this.bytes = b;
@@ -53,7 +53,7 @@ package haxe.io;
 		}
 		@:arrayAccess inline function get(i:Int) return this.bytes[i];
 		@:arrayAccess inline function set(i:Int,v:Int) return this.bytes[i] = v;
-		@:to inline function toBytes() : hl.types.Bytes {
+		@:to inline function toBytes() : hl.Bytes {
 			return this == null ? null : this.bytes;
 		}
 	}

std/haxe/io/BytesInput.hx

@@ -22,7 +22,7 @@
 package haxe.io;
 
 class BytesInput extends Input {
-	var b : #if js js.html.Uint8Array #elseif hl hl.types.Bytes #else BytesData #end;
+	var b : #if js js.html.Uint8Array #elseif hl hl.Bytes #else BytesData #end;
 	#if !flash
 	var pos : Int;
 	var len : Int;

std/haxe/rtti/Meta.hx

@@ -73,7 +73,7 @@ class Meta {
 		}
 		return ret;
 #elseif hl
-		var t : hl.types.BaseType = t;
+		var t : hl.BaseType = t;
 		return t.__meta__;
 #else
 		return untyped t.__meta__;

std/hl/types/NativeAbstract.hx → std/hl/Abstract.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
-extern class NativeAbstract<Const> {
+extern class Abstract<Const> {
 }

std/hl/types/Api.hx → std/hl/Api.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 extern class Api {
 

std/hl/types/BaseType.hx → std/hl/BaseType.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:keep
 class BaseType {
@@ -29,12 +29,12 @@ class BaseType {
 	public function check( v : Dynamic ) {
 		var t = Type.getDynamic(v);
 		if( t.kind == HVirtual ) {
-			var v2 = hl.types.Api.getVirtualValue(v);
+			var v2 = hl.Api.getVirtualValue(v);
 			if( v2 != null ) t = Type.getDynamic(v2);
 		}
 		if( __implementedBy__ == null ) {
 			if( t.safeCast(__type__) )
-				return true;		
+				return true;
 			return false;
 		}
 		for( i in __implementedBy__ )
@@ -53,14 +53,14 @@ class Class extends BaseType {
 @:keep
 class Enum extends BaseType {
 	public var __ename__ : String;
-	public var __emap__ : NativeBytesMap;
+	public var __emap__ : hl.types.BytesMap;
 	public var __constructs__ : Array<String>;
 	public var __evalues__ : NativeArray<Dynamic>;
 	function new(t,vals) @:privateAccess {
 		__type__ = t;
 		__evalues__ = vals;
 		__ename__ = t.getName();
-		__emap__ = new NativeBytesMap();
+		__emap__ = new hl.types.BytesMap();
 		__constructs__ = new Array();
 		var cl = t.getEnumFields();
 		for( i in 0...cl.length ) {

std/hl/Boot.hx

@@ -22,11 +22,8 @@
 package hl;
 
 import hl.types.ArrayDyn;
-import hl.types.BaseType;
+import hl.BaseType;
 
 @:dox(hide)
 extern class Boot {
-	@:extern public inline static function dump( v : Dynamic ) : Void {
-		untyped $dump(v);
-	}
 }

std/hl/types/Bytes.hx → std/hl/Bytes.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:coreType abstract Bytes {
 
@@ -113,7 +113,7 @@ package hl.types;
 		Please note that you need to retain the original unoffset'ed Bytes so it does not get garbage collected, unless the pointer was not GC allocated.
 	**/
 	@:hlNative("std","bytes_offset")
-	public function offset( pos : Int ) : hl.types.Bytes {
+	public function offset( pos : Int ) : Bytes {
 		return null;
 	}
 

std/hl/types/BytesAccess.hx → std/hl/BytesAccess.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:coreType abstract BytesAccess<T> from Bytes to Bytes {
 

std/hl/types/F32.hx → std/hl/F32.hx

@@ -19,6 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 typedef F32 = Single;

std/hl/types/F64.hx → std/hl/F64.hx

@@ -19,6 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 typedef F64 = Float;

std/hl/Format.hx

@@ -45,7 +45,7 @@ class Format {
 		Decode JPG data into the target buffer.
 	**/
 	@:hlNative("fmt","jpg_decode")
-	public static function decodeJPG( src : hl.types.Bytes, srcLen : Int, dst : hl.types.Bytes, width : Int, height : Int, stride : Int, format : PixelFormat, flags : Int ) : Bool {
+	public static function decodeJPG( src : hl.Bytes, srcLen : Int, dst : hl.Bytes, width : Int, height : Int, stride : Int, format : PixelFormat, flags : Int ) : Bool {
 		return false;
 	}
 
@@ -53,7 +53,7 @@ class Format {
 		Decode PNG data into the target buffer.
 	**/
 	@:hlNative("fmt","png_decode")
-	public static function decodePNG( src : hl.types.Bytes, srcLen : Int, dst : hl.types.Bytes, width : Int, height : Int, stride : Int, format : PixelFormat, flags : Int ) : Bool {
+	public static function decodePNG( src : hl.Bytes, srcLen : Int, dst : hl.Bytes, width : Int, height : Int, stride : Int, format : PixelFormat, flags : Int ) : Bool {
 		return false;
 	}
 
@@ -62,7 +62,7 @@ class Format {
 		Currently supported flag bits: 1 = bilinear filtering
 	**/
 	@:hlNative("fmt","img_scale")
-	public static function scaleImage( out : hl.types.Bytes, outPos : Int,  outStride : Int, outWidth : Int, outHeight : Int, _in : hl.types.Bytes, inPos : Int,  inStride : Int, inWidth : Int, inHeight : Int, flags : Int ) {
+	public static function scaleImage( out : hl.Bytes, outPos : Int,  outStride : Int, outWidth : Int, outHeight : Int, _in : hl.Bytes, inPos : Int,  inStride : Int, inWidth : Int, inHeight : Int, flags : Int ) {
 	}
 
 }

std/hl/types/NativeArray.hx → std/hl/NativeArray.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:generic class NativeArrayIterator<T> {
 	var arr : NativeArray<T>;

std/hl/types/Ref.hx → std/hl/Ref.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:coreType abstract Ref<T> {
 

std/hl/types/Type.hx → std/hl/Type.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:enum
 abstract TypeKind(Int) {

std/hl/UI.hx

@@ -65,7 +65,7 @@ class Window {
 	}
 
 	@:hlNative("ui","ui_win_set_text")
-	static function win_set_text( win : WinHandle, text : hl.types.Bytes ) : Void {
+	static function win_set_text( win : WinHandle, text : hl.Bytes ) : Void {
 	}
 
 	@:hlNative("ui","ui_win_set_enable")
@@ -85,7 +85,7 @@ class Button extends Window {
 	}
 
 	@:hlNative("ui", "ui_button_new")
-	static function button_new( parent : WinHandle, text : hl.types.Bytes, onClick : Void -> Void ) : WinHandle {
+	static function button_new( parent : WinHandle, text : hl.Bytes, onClick : Void -> Void ) : WinHandle {
 		return null;
 	}
 
@@ -103,12 +103,12 @@ class WinLog extends Window {
 
 
 	@:hlNative("ui","ui_winlog_new")
-	static function winlog_new( text : hl.types.Bytes, width : Int, height : Int ) : WinHandle {
+	static function winlog_new( text : hl.Bytes, width : Int, height : Int ) : WinHandle {
 		return null;
 	}
 
 	@:hlNative("ui","ui_winlog_set_text")
-	static function winlog_set_text( win : WinHandle, text : hl.types.Bytes, autoScroll : Bool ) : Void {
+	static function winlog_set_text( win : WinHandle, text : hl.Bytes, autoScroll : Bool ) : Void {
 	}
 
 }
@@ -136,7 +136,7 @@ class UI {
 	}
 
 	@:hlNative("ui","ui_dialog")
-	static function _dialog( title : hl.types.Bytes, text : hl.types.Bytes, flags : Int ) : Int {
+	static function _dialog( title : hl.Bytes, text : hl.Bytes, flags : Int ) : Int {
 		return 0;
 	}
 

std/hl/types/UI16.hx → std/hl/UI16.hx

@@ -19,6 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:coreType @:notNull @:runtimeValue abstract UI16 to Int from Int {}

std/hl/types/UI8.hx → std/hl/UI8.hx

@@ -19,6 +19,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hl.types;
+package hl;
 
 @:coreType @:notNull @:runtimeValue abstract UI8 to Int from Int {}

std/hl/_std/Date.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-import hl.types.Ref;
+import hl.Ref;
 
 @:coreApi @:final class Date {
 
@@ -92,7 +92,7 @@ import hl.types.Ref;
 		d.t = t;
 		return d;
 	}
-	
+
 	public static function fromTime( t : Float ) : Date {
 		var d : Date = untyped $new(Date);
 		d.t = date_from_time(t);
@@ -121,7 +121,7 @@ import hl.types.Ref;
 	}
 
 	@:hlNative
-	static function date_from_string( b : hl.types.Bytes, len : Int ) : Int {
+	static function date_from_string( b : hl.Bytes, len : Int ) : Int {
 		return 0;
 	}
 
@@ -135,7 +135,7 @@ import hl.types.Ref;
 	}
 
 	@:hlNative
-	static function date_to_string( t : Int, outLen : Ref<Int> ) : hl.types.Bytes {
+	static function date_to_string( t : Int, outLen : Ref<Int> ) : hl.Bytes {
 		return null;
 	}
 

std/hl/_std/EReg.hx

@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-private typedef ERegValue = hl.types.NativeAbstract<"ereg">;
+private typedef ERegValue = hl.Abstract<"ereg">;
 
 @:access(String)
 @:coreApi @:final class EReg {
@@ -184,15 +184,15 @@ private typedef ERegValue = hl.types.NativeAbstract<"ereg">;
 	}
 
 
-	@:hlNative("std", "regexp_new_options") static function regexp_new_options( bytes : hl.types.Bytes, options : hl.types.Bytes ) : ERegValue {
+	@:hlNative("std", "regexp_new_options") static function regexp_new_options( bytes : hl.Bytes, options : hl.Bytes ) : ERegValue {
 		return null;
 	}
 
-	@:hlNative("std", "regexp_match") static function regexp_match( r : ERegValue, str : hl.types.Bytes, pos : Int, size : Int ) : Bool {
+	@:hlNative("std", "regexp_match") static function regexp_match( r : ERegValue, str : hl.Bytes, pos : Int, size : Int ) : Bool {
 		return false;
 	}
 
-	@:hlNative("std", "regexp_matched_pos") static function regexp_matched_pos( r : ERegValue, n : Int, size : hl.types.Ref<Int> ) : Int {
+	@:hlNative("std", "regexp_matched_pos") static function regexp_matched_pos( r : ERegValue, n : Int, size : hl.Ref<Int> ) : Int {
 		return 0;
 	}
 

std/hl/_std/Reflect.hx

@@ -26,18 +26,18 @@ class Reflect {
 	public static function hasField( o : Dynamic, field : String ) : Bool {
 		if( field == null ) return false;
 		var hash = @:privateAccess field.bytes.hash();
-		return hl.types.Api.hasField(o,hash);
+		return hl.Api.hasField(o,hash);
 	}
 
 	public static function field( o : Dynamic, field : String ) : Dynamic {
 		if( field == null ) return null;
 		var hash = @:privateAccess field.bytes.hash();
-		return hl.types.Api.getField(o,hash);
+		return hl.Api.getField(o,hash);
 	}
 
 	public static function setField( o : Dynamic, field : String, value : Dynamic ) : Void {
 		var hash = @:privateAccess field.bytes.hash();
-		hl.types.Api.setField(o,hash,value);
+		hl.Api.setField(o,hash,value);
 	}
 
 	public static function getProperty( o : Dynamic, field : String ) : Dynamic {
@@ -59,11 +59,11 @@ class Reflect {
 		var args : hl.types.ArrayDyn = cast args;
 		var count = args.length;
 
-		var ft = hl.types.Type.getDynamic(func);
+		var ft = hl.Type.getDynamic(func);
 		if( ft.kind != HFun )
 			throw "Invalid function " + func;
 		var need = ft.getArgsCount();
-		var cval = hl.types.Api.getClosureValue(func);
+		var cval = hl.Api.getClosureValue(func);
 		var isClosure = cval != null && need >= 0;
 		if( o == null )
 			o = cval;
@@ -72,20 +72,20 @@ class Reflect {
 		var nargs = o == null ? count : count + 1;
 		if( isClosure ) need++;
 		if( nargs < need ) nargs = need;
-		var a = new hl.types.NativeArray<Dynamic>(nargs);
+		var a = new hl.NativeArray<Dynamic>(nargs);
 		if( o == null || need < 0 ) {
 			for( i in 0...count )
 				a[i] = args.getDyn(i);
 		} else {
-			func = hl.types.Api.noClosure(func);
+			func = hl.Api.noClosure(func);
 			a[0] = o;
 			for( i in 0...count )
 				a[i+1] = args.getDyn(i);
 		}
-		return hl.types.Api.callMethod(func,a);
+		return hl.Api.callMethod(func,a);
 	}
 
-	@:hlNative("std","obj_fields") static function getObjectFields( v : Dynamic ) : hl.types.NativeArray<hl.types.Bytes> {
+	@:hlNative("std","obj_fields") static function getObjectFields( v : Dynamic ) : hl.NativeArray<hl.Bytes> {
 		return null;
 	}
 
@@ -96,7 +96,7 @@ class Reflect {
 	}
 
 	public static inline function isFunction( f : Dynamic ) : Bool {
-		return hl.types.Type.getDynamic(f).kind == HFun;
+		return hl.Type.getDynamic(f).kind == HFun;
 	}
 
 	@:hlNative("std","dyn_compare")
@@ -110,17 +110,17 @@ class Reflect {
 	}
 
 	public static function isObject( v : Dynamic ) : Bool {
-		var t = hl.types.Type.getDynamic(v);
+		var t = hl.Type.getDynamic(v);
 		return switch( t.kind ) { case HObj, HDynObj, HVirtual: true; default: false; }
 	}
 
 	public static function isEnumValue( v : Dynamic ) : Bool {
-		var t = hl.types.Type.getDynamic(v);
+		var t = hl.Type.getDynamic(v);
 		return t.kind == HEnum;
 	}
 
 	public static function deleteField( o : Dynamic, field : String ) : Bool {
-		return hl.types.Api.deleteField(o,@:privateAccess field.bytes.hash());
+		return hl.Api.deleteField(o,@:privateAccess field.bytes.hash());
 	}
 
 	@:hlNative("std","obj_copy")
@@ -134,7 +134,7 @@ class Reflect {
 	}
 
 	static function _makeVarArgs( f : Array<Dynamic> -> Dynamic ) : Dynamic {
-		return hl.types.Api.makeVarArgs(function(args:hl.types.NativeArray<Dynamic>) {
+		return hl.Api.makeVarArgs(function(args:hl.NativeArray<Dynamic>) {
 			var arr = hl.types.ArrayDyn.alloc(hl.types.ArrayObj.alloc(args), true);
 			return f(cast arr);
 		});

std/hl/_std/Std.hx

@@ -21,7 +21,7 @@
  */
 import hl.Boot;
 
-private typedef Rand = hl.types.NativeAbstract<"hl_random">;
+private typedef Rand = hl.Abstract<"hl_random">;
 
 @:coreApi
 class Std {
@@ -31,7 +31,7 @@ class Std {
 	static function __init__() : Void {
 		rnd = rnd_sys();
 	}
-	
+
 	@:hlNative("std","rnd_init_system") static function rnd_sys() : Rand { return null; }
 	@:hlNative("std","rnd_int") static function rnd_int( r : Rand ) : Int { return 0; }
 	@:hlNative("std","rnd_float") static function rnd_float( r : Rand ) : Float { return 0.; }
@@ -41,19 +41,19 @@ class Std {
 	}
 
 	public static function is( v : Dynamic, t : Dynamic ) : Bool {
-		var t : hl.types.BaseType = t;
+		var t : hl.BaseType = t;
 		if( t == null ) return false;
 		switch( t.__type__.kind ) {
 		case HDyn:
 			return true;
 		case HF64:
-			switch( hl.types.Type.getDynamic(v).kind ) {
+			switch( hl.Type.getDynamic(v).kind ) {
 			case HUI8, HUI16, HI32:
 				return true;
 			default:
 			}
 		case HI32:
-			switch( hl.types.Type.getDynamic(v).kind ) {
+			switch( hl.Type.getDynamic(v).kind ) {
 			case HF32, HF64:
 				var v : Float = v;
 				return Std.int(v) == v;
@@ -65,7 +65,7 @@ class Std {
 	}
 
 	@:extern public inline static function instance<T:{},S:T>( value : T, c : Class<S> ) : S {
-		var t : hl.types.BaseType = cast c;
+		var t : hl.BaseType = cast c;
 		return t.check(value) ? cast value : null;
 	}
 
@@ -75,7 +75,7 @@ class Std {
 
 	@:keep public static function string( s : Dynamic ) : String {
 		var len = 0;
-		var bytes = hl.types.Bytes.ofValue(s,new hl.types.Ref(len));
+		var bytes = hl.Bytes.ofValue(s,new hl.Ref(len));
 		return @:privateAccess String.__alloc__(bytes,len);
 	}
 
@@ -90,11 +90,11 @@ class Std {
 	}
 
 	@:keep static function __add__( a : Dynamic, b : Dynamic ) : Dynamic {
-		var ta = hl.types.Type.getDynamic(a);
-		var tb = hl.types.Type.getDynamic(b);
-		if( ta == hl.types.Type.get("") )
+		var ta = hl.Type.getDynamic(a);
+		var tb = hl.Type.getDynamic(b);
+		if( ta == hl.Type.get("") )
 			return (a : String) + b;
-		if( tb == hl.types.Type.get("") )
+		if( tb == hl.Type.get("") )
 			return a + (b : String);
 		switch(ta.kind) {
 		case HUI8, HUI16, HI32:

std/hl/_std/String.hx

@@ -22,7 +22,7 @@
 @:coreApi
 class String {
 
-	var bytes : hl.types.Bytes;
+	var bytes : hl.Bytes;
 	public var length(default,null) : Int;
 
 	public function new(string:String) : Void {
@@ -40,7 +40,7 @@ class String {
 
 	public function charAt(index : Int) : String {
 		if( (index:UInt) >= (length:UInt) ) return "";
-		var b = new hl.types.Bytes(4);
+		var b = new hl.Bytes(4);
 		b.setUI16(0, bytes.getUI16(index<<1));
 		b.setUI16(2,0);
 		return __alloc__(b,1);
@@ -121,7 +121,7 @@ class String {
 			len = sl - pos;
 		if( pos < 0 || len <= 0 ) return "";
 
-		var b = new hl.types.Bytes((len + 1) << 1);
+		var b = new hl.Bytes((len + 1) << 1);
 		b.blit(0, bytes, pos<<1, len << 1);
 		b.setUI16(len<<1,0);
 		return __alloc__(b, len);
@@ -157,12 +157,12 @@ class String {
 	public static function fromCharCode( code : Int ) : String {
 		if( code >= 0 && code < 0x10000 ) {
 			if( code >= 0xD800 && code <= 0xDFFF ) throw "Invalid unicode char " + code;
-			var b = new hl.types.Bytes(4);
+			var b = new hl.Bytes(4);
 			b.setUI16(0, code);
 			b.setUI16(2, 0);
 			return __alloc__(b, 1);
 		} else if( code < 0x110000 ) {
-			var b = new hl.types.Bytes(6);
+			var b = new hl.Bytes(6);
 			code -= 0x10000;
 			b.setUI16(0, (code >> 10) + 0xD800);
 			b.setUI16(2, (code & 1023) + 0xDC00);
@@ -172,11 +172,11 @@ class String {
 			throw "Invalid unicode char " + code;
 	}
 
-	function toUtf8() : hl.types.Bytes {
+	function toUtf8() : hl.Bytes {
 		return bytes.utf16ToUtf8(0, null);
 	}
 
-	@:keep function __string() : hl.types.Bytes {
+	@:keep function __string() : hl.Bytes {
 		return bytes;
 	}
 
@@ -185,26 +185,26 @@ class String {
 		return v == 0 ? length - s.length : v;
 	}
 
-	@:keep static inline function __alloc__( b : hl.types.Bytes, length : Int ) : String {
+	@:keep static inline function __alloc__( b : hl.Bytes, length : Int ) : String {
 		var s : String = untyped $new(String);
 		s.bytes = b;
 		s.length = length;
 		return s;
 	}
 
-	@:keep static function call_toString( v : Dynamic ) : hl.types.Bytes {
+	@:keep static function call_toString( v : Dynamic ) : hl.Bytes {
 		var s : String = v.toString();
 		return s.bytes;
 	}
 
-	inline static function fromUCS2( b : hl.types.Bytes ) : String {
+	inline static function fromUCS2( b : hl.Bytes ) : String {
 		var s : String = untyped $new(String);
 		s.bytes = b;
 		s.length = @:privateAccess b.ucs2Length(0);
 		return s;
 	}
 
-	@:keep static function fromUTF8( b : hl.types.Bytes ) : String {
+	@:keep static function fromUTF8( b : hl.Bytes ) : String {
 		var outLen = 0;
 		var b2 = @:privateAccess b.utf8ToUtf16(0, outLen);
 		return __alloc__(b2, outLen>>1);
@@ -214,7 +214,7 @@ class String {
 		if( a == null ) a = "null";
 		if( b == null ) b = "null";
 		var asize = a.length << 1, bsize = b.length << 1, tot = asize + bsize;
-		var bytes = new hl.types.Bytes(tot+2);
+		var bytes = new hl.Bytes(tot+2);
 		bytes.blit(0, a.bytes, 0, asize);
 		bytes.blit(asize,b.bytes,0,bsize);
 		bytes.setUI16(tot, 0);

std/hl/_std/StringBuf.hx

@@ -21,7 +21,7 @@
  */
 @:coreApi class StringBuf {
 
-	var b : hl.types.Bytes;
+	var b : hl.Bytes;
 	var size : Int;
 	var pos : Int;
 	public var length(get,never) : Int;
@@ -29,7 +29,7 @@
 	public function new() : Void {
 		pos = 0;
 		size = 8; // ensure 4 bytes expand for addChar()
-		b = new hl.types.Bytes(size);
+		b = new hl.Bytes(size);
 	}
 
 	inline function get_length() : Int {
@@ -39,13 +39,13 @@
 	inline function __expand( need : Int ) : Void {
 		var nsize = (size * 3) >> 1;
 		if( need > nsize ) nsize = need;
-		var b2 = new hl.types.Bytes(nsize);
+		var b2 = new hl.Bytes(nsize);
 		b2.blit(0, b, 0, pos);
 		b = b2;
 		size = nsize;
 	}
 
-	inline function __add( bytes : hl.types.Bytes, spos : Int, ssize : Int ) : Void {
+	inline function __add( bytes : hl.Bytes, spos : Int, ssize : Int ) : Void {
 		if( pos + ssize > size ) __expand(pos + ssize);
 		b.blit(pos, bytes, spos, ssize);
 		pos += ssize;
@@ -53,7 +53,7 @@
 
 	public function add<T>( x : T ) : Void {
 		var slen = 0;
-		var sbytes = hl.types.Bytes.ofValue(x, new hl.types.Ref(slen));
+		var sbytes = hl.Bytes.ofValue(x, new hl.Ref(slen));
 		__add(sbytes, 0, slen<<1);
 	}
 

std/hl/_std/Sys.hx

@@ -38,10 +38,10 @@ class Sys {
 	static function __init__() : Void {
 		utf8Path = sys_utf8_path();
 	}
-	static function getPath( s : String ) : hl.types.Bytes {
+	static function getPath( s : String ) : hl.Bytes {
 		return utf8Path ? s.bytes.utf16ToUtf8(0, null) : s.bytes;
 	}
-	static function makePath( b : hl.types.Bytes ) : String {
+	static function makePath( b : hl.Bytes ) : String {
 		return utf8Path ? String.fromUTF8(b) : String.fromUCS2(b);
 	}
 
@@ -146,19 +146,19 @@ class Sys {
 	@:hlNative("std", "sys_cpu_time") public static function cpuTime() : Float { return 0.; };
 	@:hlNative("std", "sys_get_char") public static function getChar( echo : Bool ) : Int { return 0; }
 
-	@:hlNative("std","sys_print") static function sys_print( v : hl.types.Bytes ) : Void {};
+	@:hlNative("std","sys_print") static function sys_print( v : hl.Bytes ) : Void {};
 	@:hlNative("std", "file_stdin") static function file_stdin() : sys.io.File.FileHandle { return null; }
 	@:hlNative("std", "file_stdout") static function file_stdout() : sys.io.File.FileHandle { return null; }
 	@:hlNative("std", "file_stderr") static function file_stderr() : sys.io.File.FileHandle { return null; }
-	@:hlNative("std", "sys_args") static function sys_args() : hl.types.NativeArray<hl.types.Bytes> { return null; }
-	@:hlNative("std", "sys_get_env") static function get_env( key : hl.types.Bytes ) : hl.types.Bytes { return null; }
-	@:hlNative("std", "sys_put_env") static function put_env( key : hl.types.Bytes, val : hl.types.Bytes ) : Bool { return false; }
-	@:hlNative("std", "sys_env") static function sys_env() : hl.types.NativeArray<hl.types.Bytes> { return null; }
-	@:hlNative("std", "sys_set_time_locale") static function set_time_locale( loc : hl.types.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_get_cwd") static function get_cwd() : hl.types.Bytes { return null; }
-	@:hlNative("std", "sys_set_cwd") static function set_cwd( path : hl.types.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_command") static function sys_command( cmd : hl.types.Bytes ) : Int { return 0; }
-	@:hlNative("std", "sys_exe_path") static function sys_exe_path() : hl.types.Bytes { return null; }
-	@:hlNative("std", "sys_string") static function sys_string() : hl.types.Bytes { return null; }
+	@:hlNative("std", "sys_args") static function sys_args() : hl.NativeArray<hl.Bytes> { return null; }
+	@:hlNative("std", "sys_get_env") static function get_env( key : hl.Bytes ) : hl.Bytes { return null; }
+	@:hlNative("std", "sys_put_env") static function put_env( key : hl.Bytes, val : hl.Bytes ) : Bool { return false; }
+	@:hlNative("std", "sys_env") static function sys_env() : hl.NativeArray<hl.Bytes> { return null; }
+	@:hlNative("std", "sys_set_time_locale") static function set_time_locale( loc : hl.Bytes ) : Bool { return true; }
+	@:hlNative("std", "sys_get_cwd") static function get_cwd() : hl.Bytes { return null; }
+	@:hlNative("std", "sys_set_cwd") static function set_cwd( path : hl.Bytes ) : Bool { return true; }
+	@:hlNative("std", "sys_command") static function sys_command( cmd : hl.Bytes ) : Int { return 0; }
+	@:hlNative("std", "sys_exe_path") static function sys_exe_path() : hl.Bytes { return null; }
+	@:hlNative("std", "sys_string") static function sys_string() : hl.Bytes { return null; }
 
 }

std/hl/_std/Type.hx

@@ -35,65 +35,65 @@ enum ValueType {
 @:coreApi
 class Type {
 
-	static var allTypes(get,never) : hl.types.NativeBytesMap;
-	static inline function get_allTypes() : hl.types.NativeBytesMap return untyped $allTypes();
+	static var allTypes(get,never) : hl.types.BytesMap;
+	static inline function get_allTypes() : hl.types.BytesMap return untyped $allTypes();
 
 	@:keep static function init() : Void {
-		untyped $allTypes(new hl.types.NativeBytesMap());
+		untyped $allTypes(new hl.types.BytesMap());
 	}
 
-	@:keep static function register( b : hl.types.Bytes, t : hl.types.BaseType ) : Void {
+	@:keep static function register( b : hl.Bytes, t : hl.BaseType ) : Void {
 		allTypes.set(b, t);
 	}
 
 	public static function getClass<T>( o : T ) : Class<T> {
-		var t = hl.types.Type.getDynamic(o);
+		var t = hl.Type.getDynamic(o);
 		if( t.kind == HObj )
 			return t.getGlobal();
 		return null;
 	}
 
 	public static function getEnum( o : EnumValue ) : Enum<Dynamic> {
-		var t = hl.types.Type.getDynamic(o);
+		var t = hl.Type.getDynamic(o);
 		if( t.kind == HEnum )
 			return t.getGlobal();
 		return null;
 	}
 
 	public static function getSuperClass( c : Class<Dynamic> ) : Class<Dynamic> @:privateAccess {
-		var c : hl.types.BaseType.Class = cast c;
+		var c : hl.BaseType.Class = cast c;
 		var t = c.__type__.getSuper();
-		return t == hl.types.Type.get((null : Void)) ? null : t.getGlobal();
+		return t == hl.Type.get((null : Void)) ? null : t.getGlobal();
 	}
 
 	public static function getClassName( c : Class<Dynamic> ) : String {
-		var c : hl.types.BaseType.Class = cast c;
+		var c : hl.BaseType.Class = cast c;
 		return c.__name__;
 	}
 
 	public static function getEnumName( e : Enum<Dynamic> ) : String {
-		var e : hl.types.BaseType.Enum = cast e;
+		var e : hl.BaseType.Enum = cast e;
 		return e.__ename__;
 	}
 
 	public static function resolveClass( name : String ) : Class<Dynamic> {
-		var t : hl.types.BaseType = allTypes.get(@:privateAccess name.bytes);
-		if( t == null || !Std.is(t, hl.types.BaseType.Class) )
+		var t : hl.BaseType = allTypes.get(@:privateAccess name.bytes);
+		if( t == null || !Std.is(t, hl.BaseType.Class) )
 			return null;
 		return cast t;
 	}
 
 	public static function resolveEnum( name : String ) : Enum<Dynamic> {
-		var t : hl.types.BaseType = allTypes.get(@:privateAccess name.bytes);
-		if( t == null || !Std.is(t, hl.types.BaseType.Enum) )
+		var t : hl.BaseType = allTypes.get(@:privateAccess name.bytes);
+		if( t == null || !Std.is(t, hl.BaseType.Enum) )
 			return null;
 		return cast t;
 	}
 
 	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T {
-		var c : hl.types.BaseType.Class = cast cl;
+		var c : hl.BaseType.Class = cast cl;
 		var t = c.__type__;
-		if( t == hl.types.Type.get((null : hl.types.ArrayBase.ArrayAccess)) )
+		if( t == hl.Type.get((null : hl.types.ArrayBase.ArrayAccess)) )
 			return cast new Array<Dynamic>();
 		var o = t.allocObject();
 		if( c.__constructor__ != null ) Reflect.callMethod(o, c.__constructor__, args);
@@ -101,19 +101,19 @@ class Type {
 	}
 
 	public static function createEmptyInstance<T>( cl : Class<T> ) : T {
-		var c : hl.types.BaseType.Class = cast cl;
+		var c : hl.BaseType.Class = cast cl;
 		return c.__type__.allocObject();
 	}
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var en : hl.types.BaseType.Enum = cast e;
+		var en : hl.BaseType.Enum = cast e;
 		var idx : Null<Int> = en.__emap__.get(@:privateAccess constr.bytes);
 		if( idx == null ) throw "Unknown enum constructor " + en.__ename__ +"." + constr;
 		return createEnumIndex(e,idx,params);
 	}
 
 	public static function createEnumIndex<T>( e : Enum<T>, index : Int, ?params : Array<Dynamic> ) : T {
-		var e : hl.types.BaseType.Enum = cast e;
+		var e : hl.BaseType.Enum = cast e;
 		if( index < 0 || index >= e.__constructs__.length ) throw "Invalid enum index " + e.__ename__ +"." + index;
 		if( params == null || params.length == 0 ) {
 			var v = index >= e.__evalues__.length ? null : e.__evalues__[index];
@@ -124,7 +124,7 @@ class Type {
 		var aobj = Std.instance(@:privateAccess a.array, hl.types.ArrayObj);
 		var narr;
 		if( aobj == null ) {
-			narr = new hl.types.NativeArray<Dynamic>(a.length);
+			narr = new hl.NativeArray<Dynamic>(a.length);
 			for( i in 0...a.length )
 				narr[i] = @:privateAccess a.array.getDyn(i);
 		} else {
@@ -136,13 +136,13 @@ class Type {
 	}
 
 	public static function getInstanceFields( c : Class<Dynamic> ) : Array<String> @:privateAccess {
-		var c : hl.types.BaseType.Class = cast c;
+		var c : hl.BaseType.Class = cast c;
 		var fields = c.__type__.getInstanceFields();
 		return [for( f in fields ) String.fromUCS2(f)];
 	}
 
 	public static function getClassFields( c : Class<Dynamic> ) : Array<String> {
-		var c : hl.types.BaseType.Class = cast c;
+		var c : hl.BaseType.Class = cast c;
 		var fields = @:privateAccess Reflect.getObjectFields(c);
 		var fields = [for( f in fields ) @:privateAccess String.fromUCS2(f)];
 		fields.remove("__constructor__");
@@ -154,12 +154,12 @@ class Type {
 	}
 
 	public static function getEnumConstructs( e : Enum<Dynamic> ) : Array<String> {
-		var e : hl.types.BaseType.Enum = cast e;
+		var e : hl.BaseType.Enum = cast e;
 		return e.__constructs__.copy();
 	}
 
 	public static function typeof( v : Dynamic ) : ValueType {
-		var t = hl.types.Type.getDynamic(v);
+		var t = hl.Type.getDynamic(v);
 		switch( t.kind ) {
 		case HVoid:
 			return TNull;
@@ -181,7 +181,7 @@ class Type {
 		case HFun:
 			return TFunction;
 		case HVirtual:
-			var v = hl.types.Api.getVirtualValue(v);
+			var v = hl.Api.getVirtualValue(v);
 			if( v == null )
 				return TObject;
 			return typeof(v);
@@ -196,12 +196,12 @@ class Type {
 	}
 
 	public static function enumConstructor( e : EnumValue ) : String {
-		var en : hl.types.BaseType.Enum = cast getEnum(e);
+		var en : hl.BaseType.Enum = cast getEnum(e);
 		return en.__constructs__[Type.enumIndex(e)];
 	}
 
 	@:hlNative("std","enum_parameters")
-	static function _enumParameters( e : EnumValue ) : hl.types.NativeArray<Dynamic> {
+	static function _enumParameters( e : EnumValue ) : hl.NativeArray<Dynamic> {
 		return null;
 	}
 
@@ -215,7 +215,7 @@ class Type {
 	}
 
 	public static function allEnums<T>( e : Enum<T> ) : Array<T> {
-		var en : hl.types.BaseType.Enum = cast e;
+		var en : hl.BaseType.Enum = cast e;
 		var out = [];
 		for( i in 0...en.__evalues__.length ) {
 			var v = en.__evalues__[i];

std/hl/_std/haxe/Resource.hx

@@ -22,15 +22,15 @@
 package haxe;
 
 private class ResourceContent {
-	public var name : hl.types.Bytes;
-	public var data : hl.types.Bytes;
+	public var name : hl.Bytes;
+	public var data : hl.Bytes;
 	public var dataLen : Int;
 }
 
 @:coreApi
 class Resource {
 
-	static var content : hl.types.NativeArray<ResourceContent>;
+	static var content : hl.NativeArray<ResourceContent>;
 
 	public static function listNames() : Array<String> {
 		return [for (x in content) @:privateAccess String.fromUCS2(x.name)];

std/hl/_std/haxe/ds/IntMap.hx

@@ -25,10 +25,10 @@ package haxe.ds;
 @:coreApi
 class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
 
-	var h : hl.types.NativeIntMap;
+	var h : hl.types.IntMap;
 
 	public function new() : Void {
-		h = new hl.types.NativeIntMap();
+		h = new hl.types.IntMap();
 	}
 
 	public function set( key : Int, value : T ) : Void {
@@ -48,7 +48,7 @@ class IntMap<T> implements haxe.Constraints.IMap<Int,T> {
 	}
 
 	public function keys() : Iterator<Int> {
-		return new hl.types.NativeArray.NativeArrayIterator<Int>(h.keysArray());
+		return new hl.NativeArray.NativeArrayIterator<Int>(h.keysArray());
 	}
 
 	public function iterator() : Iterator<T> {

std/hl/_std/haxe/ds/ObjectMap.hx

@@ -25,10 +25,10 @@ package haxe.ds;
 @:coreApi
 class ObjectMap<K:{},T> implements haxe.Constraints.IMap<K,T> {
 
-	var h : hl.types.NativeObjectMap;
+	var h : hl.types.ObjectMap;
 
 	public function new() : Void {
-		h = new hl.types.NativeObjectMap();
+		h = new hl.types.ObjectMap();
 	}
 
 	public function set( key : K, value : T ) : Void {
@@ -48,7 +48,7 @@ class ObjectMap<K:{},T> implements haxe.Constraints.IMap<K,T> {
 	}
 
 	public function keys() : Iterator<K> {
-		return new hl.types.NativeArray.NativeArrayIterator<K>(cast h.keysArray());
+		return new hl.NativeArray.NativeArrayIterator<K>(cast h.keysArray());
 	}
 
 	public function iterator() : Iterator<T> {

std/hl/_std/haxe/ds/StringMap.hx

@@ -23,11 +23,11 @@
 package haxe.ds;
 
 private class StringMapKeysIterator {
-	var arr : hl.types.NativeArray<hl.types.Bytes>;
+	var arr : hl.NativeArray<hl.Bytes>;
 	var pos : Int;
 	var length : Int;
 
-	public inline function new(h:hl.types.NativeBytesMap) {
+	public inline function new(h:hl.types.BytesMap) {
 		this.arr = h.keysArray();
 		pos = 0;
 		length = arr.length;
@@ -47,10 +47,10 @@ private class StringMapKeysIterator {
 @:coreApi
 class StringMap<T> implements haxe.Constraints.IMap<String,T> {
 
-	var h : hl.types.NativeBytesMap;
+	var h : hl.types.BytesMap;
 
 	public function new() : Void {
-		h = new hl.types.NativeBytesMap();
+		h = new hl.types.BytesMap();
 	}
 
 	public function set( key : String, value : T ) : Void {

std/hl/_std/haxe/io/Bytes.hx

@@ -25,9 +25,9 @@ package haxe.io;
 class Bytes {
 
 	public var length(default,null) : Int;
-	var b : hl.types.Bytes;
+	var b : hl.Bytes;
 
-	function new(b:hl.types.Bytes,length:Int) : Void {
+	function new(b:hl.Bytes,length:Int) : Void {
 		this.b = b;
 		this.length = length;
 	}
@@ -118,7 +118,7 @@ class Bytes {
 	public function getString( pos : Int, len : Int ) : String {
 		if( pos < 0 || len < 0 || pos + len > length ) throw Error.OutsideBounds;
 
-		var b = new hl.types.Bytes(len + 1);
+		var b = new hl.Bytes(len + 1);
 		b.blit(0, this.b, pos, len);
 		b[len] = 0;
 		return @:privateAccess String.fromUTF8(b);
@@ -153,7 +153,7 @@ class Bytes {
 	}
 
 	public static function alloc( length : Int ) : Bytes {
-		var b = new hl.types.Bytes(length);
+		var b = new hl.Bytes(length);
 		b.fill(0, length, 0);
 		return new Bytes(b,length);
 	}

std/hl/_std/haxe/io/BytesBuffer.hx

@@ -24,7 +24,7 @@ package haxe.io;
 @:coreApi
 class BytesBuffer {
 
-	var b : hl.types.Bytes;
+	var b : hl.Bytes;
 	var pos : Int;
 	var size : Int;
 
@@ -33,7 +33,7 @@ class BytesBuffer {
 	public function new() {
 		pos = 0;
 		size = 16; // ensure increment of 8
-		b = new hl.types.Bytes(size);
+		b = new hl.Bytes(size);
 	}
 
 	inline function get_length() : Int {
@@ -48,13 +48,13 @@ class BytesBuffer {
 	function __expand( req : Int ) : Void {
 		var nsize = (size * 3) >> 1;
 		if( nsize < req ) nsize = req;
-		var b2 = new hl.types.Bytes(nsize);
+		var b2 = new hl.Bytes(nsize);
 		b2.blit(0, b, 0, pos);
 		b = b2;
 		size = nsize;
 	}
 
-	function __add( b : hl.types.Bytes, bpos : Int, blen : Int ) : Void {
+	function __add( b : hl.Bytes, bpos : Int, blen : Int ) : Void {
 		if( pos + blen > size ) __expand(pos+blen);
 		this.b.blit(pos, b, bpos, blen);
 		pos += blen;

std/hl/_std/haxe/io/FPHelper.hx

@@ -25,7 +25,7 @@ class FPHelper {
 
 	// note : this is not thread safe, use TLS when available
 	static var i64tmp = Int64.ofInt(0);
-	static var helper = new hl.types.Bytes(8);
+	static var helper = new hl.Bytes(8);
 
 	public static function i32ToFloat( i : Int ) : Single {
 		helper.setI32(0,i);

std/hl/_std/haxe/zip/Compress.hx

@@ -61,7 +61,7 @@ class Compress {
 	}
 
 	static function deflate_init( level : Int ) : Deflater { return null; }
-	static function deflate_buffer( i : Deflater, bytes : hl.types.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.types.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
+	static function deflate_buffer( i : Deflater, bytes : hl.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
 		return false;
 	}
 	static function deflate_bound( i : Deflater, length : Int ) : Int { return 0; }

std/hl/_std/haxe/zip/Uncompress.hx

@@ -65,7 +65,7 @@ class Uncompress {
 	}
 
 	static function inflate_init( bits : Int ) : Inflater { return null; }
-	static function inflate_buffer( i : Inflater, bytes : hl.types.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.types.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
+	static function inflate_buffer( i : Inflater, bytes : hl.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
 		return false;
 	}
 	static function zip_end( i : Inflater ) : Void { }

std/hl/_std/sys/FileSystem.hx

@@ -102,14 +102,14 @@ class FileSystem {
 		}
 	}
 
-	@:hlNative("std", "sys_read_dir") static function sys_read_dir( path : hl.types.Bytes ) : hl.types.NativeArray<hl.types.Bytes> { return null; }
-	@:hlNative("std", "sys_create_dir") static function sys_create_dir( path : hl.types.Bytes, rights : Int ) : Bool { return false; }
-	@:hlNative("std", "sys_is_dir") static function sys_is_dir( path : hl.types.Bytes ) : Bool { return false; }
-	@:hlNative("std", "sys_stat") static function sys_stat( path : hl.types.Bytes ) : hl.types.NativeArray<Int> { return null; }
-	@:hlNative("std", "sys_rename") static function sys_rename( path : hl.types.Bytes, to : hl.types.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_delete") static function sys_delete( path : hl.types.Bytes ) : Bool { return true; };
-	@:hlNative("std", "sys_full_path") static function sys_full_path( path : hl.types.Bytes ) : hl.types.Bytes { return null; }
-	@:hlNative("std", "sys_remove_dir") static function sys_remove_dir( path : hl.types.Bytes ) : Bool { return true; }
-	@:hlNative("std", "sys_exists") static function sys_exists( path : hl.types.Bytes ) : Bool { return true; }
+	@:hlNative("std", "sys_read_dir") static function sys_read_dir( path : hl.Bytes ) : hl.NativeArray<hl.Bytes> { return null; }
+	@:hlNative("std", "sys_create_dir") static function sys_create_dir( path : hl.Bytes, rights : Int ) : Bool { return false; }
+	@:hlNative("std", "sys_is_dir") static function sys_is_dir( path : hl.Bytes ) : Bool { return false; }
+	@:hlNative("std", "sys_stat") static function sys_stat( path : hl.Bytes ) : hl.NativeArray<Int> { return null; }
+	@:hlNative("std", "sys_rename") static function sys_rename( path : hl.Bytes, to : hl.Bytes ) : Bool { return true; }
+	@:hlNative("std", "sys_delete") static function sys_delete( path : hl.Bytes ) : Bool { return true; };
+	@:hlNative("std", "sys_full_path") static function sys_full_path( path : hl.Bytes ) : hl.Bytes { return null; }
+	@:hlNative("std", "sys_remove_dir") static function sys_remove_dir( path : hl.Bytes ) : Bool { return true; }
+	@:hlNative("std", "sys_exists") static function sys_exists( path : hl.Bytes ) : Bool { return true; }
 
 }

std/hl/_std/sys/db/Sqlite.hx

@@ -28,19 +28,19 @@ private typedef SqliteResultHandle = hl.types.NativeAbstract<"sqlite_result">;
 @:hlNative("sqlite")
 private class SqliteLib
 {
-	public static function connect( path : hl.types.Bytes ) : SqliteConnectionHandle { return null; }
+	public static function connect( path : hl.Bytes ) : SqliteConnectionHandle { return null; }
 	public static function close( c : SqliteConnectionHandle ) : Void { }
-	public static function request( c : SqliteConnectionHandle, sql : hl.types.Bytes ) : SqliteResultHandle { return null; }
+	public static function request( c : SqliteConnectionHandle, sql : hl.Bytes ) : SqliteResultHandle { return null; }
 	public static function last_id( c : SqliteConnectionHandle ) : Int { return 0; }
 	
-	public static function result_next( c : SqliteResultHandle ) : hl.types.NativeArray<Dynamic> { return null; }
+	public static function result_next( c : SqliteResultHandle ) : hl.NativeArray<Dynamic> { return null; }
 	
-	public static function result_get( c : SqliteResultHandle, n : Int ) : Null<hl.types.Bytes> { return null; }
+	public static function result_get( c : SqliteResultHandle, n : Int ) : Null<hl.Bytes> { return null; }
 	public static function result_get_int( c : SqliteResultHandle, n : Int ) : Null<Int> { return 0; }
 	public static function result_get_float( c : SqliteResultHandle, n : Int ) : Null<Float> { return .0; }
 	public static function result_get_length( c : SqliteResultHandle ) : Null<Int> { return 0; }
 	public static function result_get_nfields( c : SqliteResultHandle ) : Int { return 0; }
-	public static function result_get_fields( c : SqliteResultHandle ) : hl.types.NativeArray<hl.types.Bytes> { return null; }
+	public static function result_get_fields( c : SqliteResultHandle ) : hl.NativeArray<hl.Bytes> { return null; }
 }
 
 
@@ -206,7 +206,7 @@ private class SqliteResultSet implements ResultSet
 		{
 			var n : String = names[i];
 			var v : Dynamic = a[i];
-			if ( hl.types.Type.getDynamic(v).kind == hl.types.Type.TypeKind.HBytes )
+			if ( hl.Type.getDynamic(v).kind == hl.Type.TypeKind.HBytes )
 				Reflect.setField(o, n, String.fromUCS2(v));
 			else
 				Reflect.setField(o, n, v);

std/hl/_std/sys/io/File.hx

@@ -21,7 +21,7 @@
  */
 package sys.io;
 
-typedef FileHandle = hl.types.NativeAbstract<"hl_fdesc">;
+typedef FileHandle = hl.Abstract<"hl_fdesc">;
 
 @:access(Sys)
 @:coreApi class File {
@@ -77,7 +77,7 @@ typedef FileHandle = hl.types.NativeAbstract<"hl_fdesc">;
 		d.close();
 	}
 
-	@:hlNative("std", "file_open") static function file_open( path : hl.types.Bytes, mode : Int, binary : Bool ) : FileHandle { return null; }
-	@:hlNative("std", "file_contents") static function file_contents( path : hl.types.Bytes, size : hl.types.Ref<Int> ) : hl.types.Bytes { return null; }
+	@:hlNative("std", "file_open") static function file_open( path : hl.Bytes, mode : Int, binary : Bool ) : FileHandle { return null; }
+	@:hlNative("std", "file_contents") static function file_contents( path : hl.Bytes, size : hl.Ref<Int> ) : hl.Bytes { return null; }
 
 }

std/hl/_std/sys/io/FileInput.hx

@@ -64,7 +64,7 @@ import sys.io.File;
 	}
 
 	@:hlNative("std", "file_eof") static function file_eof( f : FileHandle ) : Bool { return false; }
-	@:hlNative("std", "file_read") static function file_read( f : FileHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std", "file_read") static function file_read( f : FileHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
 	@:hlNative("std", "file_read_char") static function file_read_char( f : FileHandle ) : Int { return 0; }
 	@:hlNative("std", "file_close") static function file_close( f : FileHandle ) : Void { }
 	@:hlNative("std", "file_seek") static function file_seek( f : FileHandle, pos : Int, from : Int ) : Bool { return true; }

std/hl/_std/sys/io/FileOutput.hx

@@ -62,7 +62,7 @@ import sys.io.File;
 	}
 
 	@:hlNative("std","file_flush") static function file_flush( f : FileHandle ) : Bool { return true; }
-	@:hlNative("std", "file_write") static function file_write( f : FileHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std", "file_write") static function file_write( f : FileHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
 	@:hlNative("std", "file_write_char") static function file_write_char( f : FileHandle, v : Int ) : Bool { return true; }
 
 }

std/hl/_std/sys/io/Process.hx

@@ -49,7 +49,7 @@ private class Stdin extends haxe.io.Output {
 		return v;
 	}
 
-	@:hlNative("std","process_stdin_write") static function _stdin_write( p : ProcessHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std","process_stdin_write") static function _stdin_write( p : ProcessHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
 	@:hlNative("std","process_stdin_close") static function _stdin_close( p : ProcessHandle ) : Void { }
 
 }
@@ -78,8 +78,8 @@ private class Stdout extends haxe.io.Input {
 		return v;
 	}
 
-	@:hlNative("std","process_stdout_read") static function _stdout_read( p : ProcessHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
-	@:hlNative("std","process_stderr_read") static function _stderr_read( p : ProcessHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std","process_stdout_read") static function _stdout_read( p : ProcessHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std","process_stderr_read") static function _stderr_read( p : ProcessHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
 
 }
 
@@ -95,7 +95,7 @@ private class Stdout extends haxe.io.Input {
 		@:privateAccess {
 			var aargs = null;
 			if( args != null ) {
-				aargs = new hl.types.NativeArray<hl.types.Bytes>(args.length);
+				aargs = new hl.NativeArray<hl.Bytes>(args.length);
 				for( i in 0...args.length )
 					aargs[i] = Sys.getPath(args[i]);
 			}
@@ -124,7 +124,7 @@ private class Stdout extends haxe.io.Input {
 		_kill(p);
 	}
 
-	@:hlNative("std","process_run")	static function _run( cmd : hl.types.Bytes, args : hl.types.NativeArray<hl.types.Bytes> ) : ProcessHandle { return null; }
+	@:hlNative("std","process_run")	static function _run( cmd : hl.Bytes, args : hl.NativeArray<hl.Bytes> ) : ProcessHandle { return null; }
 	@:hlNative("std", "process_exit") static function _exit( p : ProcessHandle ) : Int { return 0; }
 	@:hlNative("std", "process_pid") static function _pid( p : ProcessHandle ) : Int { return 0; }
 	@:hlNative("std","process_close") static function _close( p : ProcessHandle ) : Void { }

std/hl/_std/sys/net/Host.hx

@@ -46,9 +46,9 @@ class Host {
 		return @:privateAccess String.fromUTF8(host_local());
 	}
 
-	@:hlNative("std","host_resolve") static function host_resolve( name : hl.types.Bytes ) : Int { return 0; }
-	@:hlNative("std","host_reverse") static function host_reverse( host : Int ) : hl.types.Bytes { return null; }
-	@:hlNative("std","host_to_string") static function host_to_string( host : Int ) : hl.types.Bytes { return null; }
-	@:hlNative("std","host_local") static function host_local() : hl.types.Bytes { return null; }
+	@:hlNative("std","host_resolve") static function host_resolve( name : hl.Bytes ) : Int { return 0; }
+	@:hlNative("std","host_reverse") static function host_reverse( host : Int ) : hl.Bytes { return null; }
+	@:hlNative("std","host_to_string") static function host_to_string( host : Int ) : hl.Bytes { return null; }
+	@:hlNative("std","host_local") static function host_local() : hl.Bytes { return null; }
 
 }

std/hl/_std/sys/net/Socket.hx

@@ -56,7 +56,7 @@ private class SocketOutput extends haxe.io.Output {
 
 
 	@:hlNative("std","socket_send_char") static function socket_send_char( s : SocketHandle, c : Int ) : Int { return 0; }
-	@:hlNative("std","socket_send") static function socket_send( s : SocketHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std","socket_send") static function socket_send( s : SocketHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
 
 }
 
@@ -91,7 +91,7 @@ private class SocketInput extends haxe.io.Input {
 		sock.close();
 	}
 
-	@:hlNative("std","socket_recv") static function socket_recv( s : SocketHandle, bytes : hl.types.Bytes, pos : Int, len : Int ) : Int { return 0; }
+	@:hlNative("std","socket_recv") static function socket_recv( s : SocketHandle, bytes : hl.Bytes, pos : Int, len : Int ) : Int { return 0; }
 	@:hlNative("std","socket_recv_char") static function socket_recv_char( s : SocketHandle ) : Int { return 0; }
 
 }

std/hl/types/ArrayBase.hx

@@ -108,7 +108,7 @@ class ArrayBase extends ArrayAccess {
 	}
 
 	public static function allocI32( bytes : BytesAccess<Int>, length : Int ) @:privateAccess {
-		var a : ArrayBasic.ArrayI32 = untyped $new(ArrayBasic.ArrayI32);
+		var a : ArrayBytes.ArrayI32 = untyped $new(ArrayBytes.ArrayI32);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
@@ -116,7 +116,7 @@ class ArrayBase extends ArrayAccess {
 	}
 
 	public static function allocUI16( bytes : BytesAccess<UI16>, length : Int ) @:privateAccess {
-		var a : ArrayBasic.ArrayUI16 = untyped $new(ArrayBasic.ArrayUI16);
+		var a : ArrayBytes.ArrayUI16 = untyped $new(ArrayBytes.ArrayUI16);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
@@ -124,7 +124,7 @@ class ArrayBase extends ArrayAccess {
 	}
 
 	public static function allocF32( bytes : BytesAccess<F32>, length : Int ) @:privateAccess {
-		var a : ArrayBasic.ArrayF32 = untyped $new(ArrayBasic.ArrayF32);
+		var a : ArrayBytes.ArrayF32 = untyped $new(ArrayBytes.ArrayF32);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;
@@ -132,7 +132,7 @@ class ArrayBase extends ArrayAccess {
 	}
 
 	public static function allocF64( bytes : BytesAccess<Float>, length : Int ) @:privateAccess {
-		var a : ArrayBasic.ArrayF64 = untyped $new(ArrayBasic.ArrayF64);
+		var a : ArrayBytes.ArrayF64 = untyped $new(ArrayBytes.ArrayF64);
 		a.length = length;
 		a.bytes = bytes;
 		a.size = length;

std/hl/types/ArrayBasic.hx → std/hl/types/ArrayBytes.hx

@@ -23,9 +23,9 @@ package hl.types;
 
 @:keep
 @:generic
-class BasicIterator<T> {
+class BytesIterator<T> {
 	var pos : Int;
-	var a : ArrayBasic<T>;
+	var a : ArrayBytes<T>;
 	public function new(a) {
 		this.a = a;
 	}
@@ -38,9 +38,9 @@ class BasicIterator<T> {
 }
 
 @:keep
-@:generic class ArrayBasic<T> extends ArrayBase {
+@:generic class ArrayBytes<T> extends ArrayBase {
 
-	var bytes : hl.types.BytesAccess<T>;
+	var bytes : hl.BytesAccess<T>;
 	var size : Int;
 
 	public function new() {
@@ -48,8 +48,8 @@ class BasicIterator<T> {
 		bytes = null;
 	}
 
-	public function concat( a : ArrayBasic<T> ) : ArrayBasic<T> {
-		var ac = new ArrayBasic<T>();
+	public function concat( a : ArrayBytes<T> ) : ArrayBytes<T> {
+		var ac = new ArrayBytes<T>();
 		ac.length = ac.size = length + a.length;
 		ac.bytes = new Bytes(ac.length << bytes.sizeBits);
 		var offset = length << bytes.sizeBits;
@@ -103,12 +103,12 @@ class BasicIterator<T> {
 	}
 
 	override function blit( pos : Int, src : ArrayBase.ArrayAccess, srcpos : Int, len : Int ) : Void {
-		var src = (cast src : ArrayBasic<T>);
+		var src = (cast src : ArrayBytes<T>);
 		if( pos < 0 || srcpos < 0 || len < 0 || pos + len > length || srcpos + len > src.length ) throw haxe.io.Error.OutsideBounds;
 		(bytes:Bytes).blit(pos << bytes.sizeBits,src.bytes,srcpos<<bytes.sizeBits,len<<bytes.sizeBits);
 	}
 
-	override function slice( pos : Int, ?end : Int ) : ArrayBasic<T> {
+	override function slice( pos : Int, ?end : Int ) : ArrayBytes<T> {
 		if( pos < 0 ) {
 			pos = this.length + pos;
 			if( pos < 0 )
@@ -126,8 +126,8 @@ class BasicIterator<T> {
 		}
 		var len = pend - pos;
 		if( len < 0 )
-			return new ArrayBasic<T>();
-		var a = new ArrayBasic<T>();
+			return new ArrayBytes<T>();
+		var a = new ArrayBytes<T>();
 		a.length = a.size = len;
 		a.bytes = (bytes:Bytes).sub(pos << bytes.sizeBits, len << bytes.sizeBits);
 		return a;
@@ -140,9 +140,9 @@ class BasicIterator<T> {
 			(bytes:Bytes).sortF64(0, length, cast f);
 	}
 
-	override function splice( pos : Int, len : Int ) : ArrayBasic<T> {
+	override function splice( pos : Int, len : Int ) : ArrayBytes<T> {
 		if( len < 0 )
-			return new ArrayBasic<T>();
+			return new ArrayBytes<T>();
 		if( pos < 0 ){
 			pos = this.length + pos;
 			if( pos < 0 ) pos = 0;
@@ -155,8 +155,8 @@ class BasicIterator<T> {
 			if( len < 0 ) len = 0;
 		}
 		if( len == 0 )
-			return new ArrayBasic<T>();
-		var ret = new ArrayBasic<T>();
+			return new ArrayBytes<T>();
+		var ret = new ArrayBytes<T>();
 		ret.bytes = (bytes:Bytes).sub(pos << bytes.sizeBits, len << bytes.sizeBits);
 		ret.size = ret.length = len;
 		var end = pos + len;
@@ -197,7 +197,7 @@ class BasicIterator<T> {
 		if( idx < 0 )
 			return false;
 		length--;
-		(bytes : hl.types.Bytes).blit(idx<<bytes.sizeBits,bytes,(idx + 1)<<bytes.sizeBits,(length - idx)<<bytes.sizeBits);
+		(bytes : hl.Bytes).blit(idx<<bytes.sizeBits,bytes,(idx + 1)<<bytes.sizeBits,(length - idx)<<bytes.sizeBits);
 		return true;
 	}
 
@@ -228,8 +228,8 @@ class BasicIterator<T> {
 		return -1;
 	}
 
-	public function copy() : ArrayBasic<T> {
-		var a = new ArrayBasic<T>();
+	public function copy() : ArrayBytes<T> {
+		var a = new ArrayBytes<T>();
 		a.length = a.size = length;
 		a.bytes = new Bytes(length << bytes.sizeBits);
 		(a.bytes:Bytes).blit(0, bytes, 0, length << bytes.sizeBits);
@@ -237,7 +237,7 @@ class BasicIterator<T> {
 	}
 
 	public function iterator() : Iterator<T> {
-		return new BasicIterator(this);
+		return new BytesIterator(this);
 	}
 
 	public function map<S>( f : T -> S ) : ArrayDyn @:privateAccess {
@@ -248,8 +248,8 @@ class BasicIterator<T> {
 		return ArrayDyn.alloc(a,true);
 	}
 
-	public function filter( f : T -> Bool ) : ArrayBasic<T> {
-		var a = new ArrayBasic<T>();
+	public function filter( f : T -> Bool ) : ArrayBytes<T> {
+		var a = new ArrayBytes<T>();
 		for( i in 0...length ) {
 			var v = bytes[i];
 			if( f(v) ) a.push(v);
@@ -286,7 +286,7 @@ class BasicIterator<T> {
 		if( newlen > size ) {
 			var next = (size * 3) >> 1;
 			if( next < newlen ) next = newlen;
-			var bytes2 = new hl.types.Bytes(next << bytes.sizeBits);
+			var bytes2 = new hl.Bytes(next << bytes.sizeBits);
 			var bsize = length << bytes.sizeBits;
 			bytes2.blit(0, bytes, 0, bsize);
 			bytes2.fill(bsize, (next << bytes.sizeBits) - bsize, 0);
@@ -298,7 +298,7 @@ class BasicIterator<T> {
 
 }
 
-typedef ArrayI32 = ArrayBasic<Int>;
-typedef ArrayUI16 = ArrayBasic<UI16>;
-typedef ArrayF32 = ArrayBasic<F32>;
-typedef ArrayF64 = ArrayBasic<Float>;
+typedef ArrayI32 = ArrayBytes<Int>;
+typedef ArrayUI16 = ArrayBytes<UI16>;
+typedef ArrayF32 = ArrayBytes<F32>;
+typedef ArrayF64 = ArrayBytes<Float>;

std/hl/types/ArrayDyn.hx

@@ -190,7 +190,7 @@ class ArrayDyn extends ArrayAccess {
 			return array;
 		if( !allowReinterpret )
 			return null;
-		if( t == Type.get(new ArrayBasic.ArrayI32()) ) {
+		if( t == Type.get(new ArrayBytes.ArrayI32()) ) {
 			var a : BytesAccess<Int> = null;
 			a = new Bytes(array.length << a.sizeBits);
 			for( i in 0...array.length )
@@ -200,7 +200,7 @@ class ArrayDyn extends ArrayAccess {
 			allowReinterpret = false;
 			return arr;
 		}
-		if( t == Type.get(new ArrayBasic.ArrayF64()) ) {
+		if( t == Type.get(new ArrayBytes.ArrayF64()) ) {
 			var a : BytesAccess<Float> = null;
 			a = new Bytes(array.length << a.sizeBits);
 			for( i in 0...array.length )

std/hl/types/ArrayObj.hx

@@ -24,7 +24,7 @@ package hl.types;
 @:keep
 class ArrayObj<T> extends ArrayBase {
 
-	var array : hl.types.NativeArray<Dynamic>;
+	var array : hl.NativeArray<Dynamic>;
 
 	public function new() {
 		length = 0;
@@ -32,7 +32,7 @@ class ArrayObj<T> extends ArrayBase {
 	}
 
 	public function concat( a : ArrayObj<T> ) : ArrayObj<T> {
-		var arr = new hl.types.NativeArray(length + a.length);
+		var arr = new hl.NativeArray(length + a.length);
 		arr.blit(0, array, 0, length);
 		arr.blit(length, a.array, 0, a.length);
 		return alloc(cast arr);
@@ -245,7 +245,7 @@ class ArrayObj<T> extends ArrayBase {
 		if( newlen > size ) {
 			var next = (size * 3) >> 1;
 			if( next < newlen ) next = newlen;
-			var arr2 = new hl.types.NativeArray<Dynamic>(next);
+			var arr2 = new hl.NativeArray<Dynamic>(next);
 			arr2.blit(0,array,0,length);
 			array = arr2;
 		}
@@ -274,7 +274,7 @@ class ArrayObj<T> extends ArrayBase {
 	override function removeDyn( v : Dynamic ) return remove(v);
 	override function sortDyn( f : Dynamic -> Dynamic -> Int ) sort(f);
 
-	public static function alloc<T>( a : hl.types.NativeArray<T> ) : ArrayObj<T> {
+	public static function alloc<T>( a : hl.NativeArray<T> ) : ArrayObj<T> {
 		var arr : ArrayObj<T> = untyped $new(ArrayObj);
 		arr.array = a;
 		arr.length = a.length;

std/hl/types/NativeBytesMap.hx → std/hl/types/BytesMap.hx

@@ -21,15 +21,15 @@
  */
 package hl.types;
 
-typedef NativeBytesMapData = NativeAbstract<"hl_bytes_map">;
+typedef BytesMapData = Abstract<"hl_bytes_map">;
 
-abstract NativeBytesMap(NativeBytesMapData) {
+abstract BytesMap(BytesMapData) {
 
 	@:extern public inline function new() {
 		this = alloc();
 	}
 
-	@:hlNative("std","hballoc") static function alloc() : NativeBytesMapData {
+	@:hlNative("std","hballoc") static function alloc() : BytesMapData {
 		return null;
 	}
 

std/hl/types/NativeIntMap.hx → std/hl/types/IntMap.hx

@@ -21,15 +21,15 @@
  */
 package hl.types;
 
-typedef NativeIntMapData = NativeAbstract<"hl_int_map">;
+typedef IntMapData = Abstract<"hl_int_map">;
 
-abstract NativeIntMap(NativeIntMapData) {
+abstract IntMap(IntMapData) {
 
 	@:extern public inline function new() {
 		this = alloc();
 	}
-	
-	@:hlNative("std","hialloc") static function alloc() : NativeIntMapData {
+
+	@:hlNative("std","hialloc") static function alloc() : IntMapData {
 		return null;
 	}
 
@@ -41,7 +41,7 @@ abstract NativeIntMap(NativeIntMapData) {
 	public function exists( key : Int ) : Bool {
 		return false;
 	}
-	
+
 	@:hlNative("std","higet")
 	public function get( key : Int ) : Dynamic {
 		return null;

std/hl/types/NativeObjectMap.hx → std/hl/types/ObjectMap.hx

@@ -21,15 +21,15 @@
  */
 package hl.types;
 
-typedef NativeObjectMapData = NativeAbstract<"hl_obj_map">;
+typedef ObjectMapData = Abstract<"hl_obj_map">;
 
-abstract NativeObjectMap(NativeObjectMapData) {
+abstract ObjectMap(ObjectMapData) {
 
 	@:extern public inline function new() {
 		this = alloc();
 	}
-	
-	@:hlNative("std","hoalloc") static function alloc() : NativeObjectMapData {
+
+	@:hlNative("std","hoalloc") static function alloc() : ObjectMapData {
 		return null;
 	}
 
@@ -41,7 +41,7 @@ abstract NativeObjectMap(NativeObjectMapData) {
 	public function exists( key : Dynamic ) : Bool {
 		return false;
 	}
-	
+
 	@:hlNative("std","hoget")
 	public function get( key : Dynamic ) : Dynamic {
 		return null;

tests/unit/src/unit/TestHL.hx

@@ -7,7 +7,7 @@ class TestHL extends Test {
 		//i *= 2;
 	//}
 
-	private function refTestAssign(i:hl.types.Ref<Int>):Void
+	private function refTestAssign(i:hl.Ref<Int>):Void
 	{
 		i.set(2);
 	}