Restructed package again for haxelib