Update files to code and xml to work with latest versions of haxe