Integrated the macro modules into one.
hxproj fix.
haxelib.json update