Renamed htmlcore target, reordered api & htmlcore