Move hypertext.html test page to subdirectory
merge upstream