diff --git a/programs/network/netsurf/build-libs/libcss.a b/contrib/network/netsurf/build-libs/libcss.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libcss.a
rename to contrib/network/netsurf/build-libs/libcss.a
diff --git a/programs/network/netsurf/build-libs/libcurl.a b/contrib/network/netsurf/build-libs/libcurl.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libcurl.a
rename to contrib/network/netsurf/build-libs/libcurl.a
diff --git a/programs/network/netsurf/build-libs/libdom.a b/contrib/network/netsurf/build-libs/libdom.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libdom.a
rename to contrib/network/netsurf/build-libs/libdom.a
diff --git a/programs/network/netsurf/build-libs/libhubbub.a b/contrib/network/netsurf/build-libs/libhubbub.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libhubbub.a
rename to contrib/network/netsurf/build-libs/libhubbub.a
diff --git a/programs/network/netsurf/build-libs/libnsbmp.a b/contrib/network/netsurf/build-libs/libnsbmp.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libnsbmp.a
rename to contrib/network/netsurf/build-libs/libnsbmp.a
diff --git a/programs/network/netsurf/build-libs/libnsfb.a b/contrib/network/netsurf/build-libs/libnsfb.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libnsfb.a
rename to contrib/network/netsurf/build-libs/libnsfb.a
diff --git a/programs/network/netsurf/build-libs/libnsgif.a b/contrib/network/netsurf/build-libs/libnsgif.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libnsgif.a
rename to contrib/network/netsurf/build-libs/libnsgif.a
diff --git a/programs/network/netsurf/build-libs/libparserutils.a b/contrib/network/netsurf/build-libs/libparserutils.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libparserutils.a
rename to contrib/network/netsurf/build-libs/libparserutils.a
diff --git a/programs/network/netsurf/build-libs/libwapcaplet.a b/contrib/network/netsurf/build-libs/libwapcaplet.a
similarity index 100%
rename from programs/network/netsurf/build-libs/libwapcaplet.a
rename to contrib/network/netsurf/build-libs/libwapcaplet.a
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL.h b/contrib/network/netsurf/dependencies/include/SDL/SDL.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_active.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_active.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_active.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_active.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_anim.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_anim.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_anim.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_anim.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_audio.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_audio.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_audio.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_audio.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_bdf.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_bdf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_bdf.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_bdf.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_byteorder.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_byteorder.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_byteorder.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_byteorder.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_byteorder.h.BAK b/contrib/network/netsurf/dependencies/include/SDL/SDL_byteorder.h.BAK
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_byteorder.h.BAK
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_byteorder.h.BAK
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_cdrom.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_cdrom.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_cdrom.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_cdrom.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_copying.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_copying.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_copying.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_copying.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_cpuinfo.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_cpuinfo.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_cpuinfo.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_cpuinfo.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_draw.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_draw.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_draw.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_draw.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_endian.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_endian.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_endian.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_endian.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_error.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_error.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_error.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_error.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_events.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_events.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_events.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_events.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_flic.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_flic.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_flic.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_flic.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_getenv.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_getenv.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_getenv.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_getenv.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_image.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_image.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_image.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_image.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_joystick.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_joystick.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_joystick.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_joystick.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_keyboard.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_keyboard.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_keyboard.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_keyboard.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_keysym.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_keysym.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_keysym.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_keysym.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_loadso.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_loadso.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_loadso.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_loadso.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_main.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_main.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_main.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_main.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_main.h.BAK b/contrib/network/netsurf/dependencies/include/SDL/SDL_main.h.BAK
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_main.h.BAK
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_main.h.BAK
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_mixer.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_mixer.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_mixer.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_mixer.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_mouse.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_mouse.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_mouse.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_mouse.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_mutex.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_mutex.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_mutex.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_mutex.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_name.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_name.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_name.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_name.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_opengl.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_opengl.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_opengl.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_opengl.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_quit.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_quit.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_quit.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_quit.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_rwops.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_rwops.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_rwops.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_rwops.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_syswm.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_syswm.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_syswm.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_syswm.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_syswm.h.BAK b/contrib/network/netsurf/dependencies/include/SDL/SDL_syswm.h.BAK
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_syswm.h.BAK
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_syswm.h.BAK
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_thread.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_thread.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_thread.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_thread.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_timer.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_timer.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_timer.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_timer.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_ttf.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_ttf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_ttf.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_ttf.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_types.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_types.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_types.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_types.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_version.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_version.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_version.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_version.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/SDL_video.h b/contrib/network/netsurf/dependencies/include/SDL/SDL_video.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/SDL_video.h
rename to contrib/network/netsurf/dependencies/include/SDL/SDL_video.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/begin_code.h b/contrib/network/netsurf/dependencies/include/SDL/begin_code.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/begin_code.h
rename to contrib/network/netsurf/dependencies/include/SDL/begin_code.h
diff --git a/programs/network/netsurf/dependencies/include/SDL/begin_code.h.BAK b/contrib/network/netsurf/dependencies/include/SDL/begin_code.h.BAK
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/begin_code.h.BAK
rename to contrib/network/netsurf/dependencies/include/SDL/begin_code.h.BAK
diff --git a/programs/network/netsurf/dependencies/include/SDL/close_code.h b/contrib/network/netsurf/dependencies/include/SDL/close_code.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/SDL/close_code.h
rename to contrib/network/netsurf/dependencies/include/SDL/close_code.h
diff --git a/programs/network/netsurf/dependencies/include/curl/curl.h b/contrib/network/netsurf/dependencies/include/curl/curl.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/curl/curl.h
rename to contrib/network/netsurf/dependencies/include/curl/curl.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/config/ftconfig.h b/contrib/network/netsurf/dependencies/include/freetype/config/ftconfig.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/config/ftconfig.h
rename to contrib/network/netsurf/dependencies/include/freetype/config/ftconfig.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/config/ftheader.h b/contrib/network/netsurf/dependencies/include/freetype/config/ftheader.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/config/ftheader.h
rename to contrib/network/netsurf/dependencies/include/freetype/config/ftheader.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/config/ftmodule.h b/contrib/network/netsurf/dependencies/include/freetype/config/ftmodule.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/config/ftmodule.h
rename to contrib/network/netsurf/dependencies/include/freetype/config/ftmodule.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/config/ftoption.h b/contrib/network/netsurf/dependencies/include/freetype/config/ftoption.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/config/ftoption.h
rename to contrib/network/netsurf/dependencies/include/freetype/config/ftoption.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/config/ftstdlib.h b/contrib/network/netsurf/dependencies/include/freetype/config/ftstdlib.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/config/ftstdlib.h
rename to contrib/network/netsurf/dependencies/include/freetype/config/ftstdlib.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/freetype.h b/contrib/network/netsurf/dependencies/include/freetype/freetype.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/freetype.h
rename to contrib/network/netsurf/dependencies/include/freetype/freetype.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ft2build.h b/contrib/network/netsurf/dependencies/include/freetype/ft2build.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ft2build.h
rename to contrib/network/netsurf/dependencies/include/freetype/ft2build.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ft_conf.h b/contrib/network/netsurf/dependencies/include/freetype/ft_conf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ft_conf.h
rename to contrib/network/netsurf/dependencies/include/freetype/ft_conf.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftadvanc.h b/contrib/network/netsurf/dependencies/include/freetype/ftadvanc.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftadvanc.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftadvanc.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftbbox.h b/contrib/network/netsurf/dependencies/include/freetype/ftbbox.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftbbox.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftbbox.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftbdf.h b/contrib/network/netsurf/dependencies/include/freetype/ftbdf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftbdf.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftbdf.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftbitmap.h b/contrib/network/netsurf/dependencies/include/freetype/ftbitmap.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftbitmap.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftbitmap.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftcache.h b/contrib/network/netsurf/dependencies/include/freetype/ftcache.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftcache.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftcache.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftchapters.h b/contrib/network/netsurf/dependencies/include/freetype/ftchapters.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftchapters.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftchapters.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftcid.h b/contrib/network/netsurf/dependencies/include/freetype/ftcid.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftcid.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftcid.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/fterrdef.h b/contrib/network/netsurf/dependencies/include/freetype/fterrdef.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/fterrdef.h
rename to contrib/network/netsurf/dependencies/include/freetype/fterrdef.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/fterrid.h b/contrib/network/netsurf/dependencies/include/freetype/fterrid.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/fterrid.h
rename to contrib/network/netsurf/dependencies/include/freetype/fterrid.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/fterrors.h b/contrib/network/netsurf/dependencies/include/freetype/fterrors.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/fterrors.h
rename to contrib/network/netsurf/dependencies/include/freetype/fterrors.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftgasp.h b/contrib/network/netsurf/dependencies/include/freetype/ftgasp.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftgasp.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftgasp.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftglyph.h b/contrib/network/netsurf/dependencies/include/freetype/ftglyph.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftglyph.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftglyph.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftgxval.h b/contrib/network/netsurf/dependencies/include/freetype/ftgxval.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftgxval.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftgxval.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftgzip.h b/contrib/network/netsurf/dependencies/include/freetype/ftgzip.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftgzip.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftgzip.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftheader.h b/contrib/network/netsurf/dependencies/include/freetype/ftheader.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftheader.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftheader.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftimage.h b/contrib/network/netsurf/dependencies/include/freetype/ftimage.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftimage.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftimage.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftincrem.h b/contrib/network/netsurf/dependencies/include/freetype/ftincrem.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftincrem.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftincrem.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftlcdfil.h b/contrib/network/netsurf/dependencies/include/freetype/ftlcdfil.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftlcdfil.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftlcdfil.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftlist.h b/contrib/network/netsurf/dependencies/include/freetype/ftlist.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftlist.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftlist.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftlzw.h b/contrib/network/netsurf/dependencies/include/freetype/ftlzw.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftlzw.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftlzw.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftmac.h b/contrib/network/netsurf/dependencies/include/freetype/ftmac.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftmac.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftmac.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftmm.h b/contrib/network/netsurf/dependencies/include/freetype/ftmm.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftmm.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftmm.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftmodapi.h b/contrib/network/netsurf/dependencies/include/freetype/ftmodapi.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftmodapi.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftmodapi.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftmoderr.h b/contrib/network/netsurf/dependencies/include/freetype/ftmoderr.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftmoderr.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftmoderr.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftnameid.h b/contrib/network/netsurf/dependencies/include/freetype/ftnameid.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftnameid.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftnameid.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftotval.h b/contrib/network/netsurf/dependencies/include/freetype/ftotval.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftotval.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftotval.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftoutln.h b/contrib/network/netsurf/dependencies/include/freetype/ftoutln.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftoutln.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftoutln.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftpfr.h b/contrib/network/netsurf/dependencies/include/freetype/ftpfr.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftpfr.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftpfr.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftrender.h b/contrib/network/netsurf/dependencies/include/freetype/ftrender.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftrender.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftrender.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftsizes.h b/contrib/network/netsurf/dependencies/include/freetype/ftsizes.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftsizes.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftsizes.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftsnames.h b/contrib/network/netsurf/dependencies/include/freetype/ftsnames.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftsnames.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftsnames.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftstroke.h b/contrib/network/netsurf/dependencies/include/freetype/ftstroke.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftstroke.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftstroke.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftsynth.h b/contrib/network/netsurf/dependencies/include/freetype/ftsynth.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftsynth.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftsynth.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftsystem.h b/contrib/network/netsurf/dependencies/include/freetype/ftsystem.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftsystem.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftsystem.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/fttrigon.h b/contrib/network/netsurf/dependencies/include/freetype/fttrigon.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/fttrigon.h
rename to contrib/network/netsurf/dependencies/include/freetype/fttrigon.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/fttypes.h b/contrib/network/netsurf/dependencies/include/freetype/fttypes.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/fttypes.h
rename to contrib/network/netsurf/dependencies/include/freetype/fttypes.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftwinfnt.h b/contrib/network/netsurf/dependencies/include/freetype/ftwinfnt.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftwinfnt.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftwinfnt.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ftxf86.h b/contrib/network/netsurf/dependencies/include/freetype/ftxf86.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ftxf86.h
rename to contrib/network/netsurf/dependencies/include/freetype/ftxf86.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/header.h b/contrib/network/netsurf/dependencies/include/freetype/header.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/header.h
rename to contrib/network/netsurf/dependencies/include/freetype/header.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/autohint.h b/contrib/network/netsurf/dependencies/include/freetype/internal/autohint.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/autohint.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/autohint.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftcalc.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftcalc.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftcalc.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftcalc.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftdebug.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftdebug.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftdebug.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftdebug.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftdriver.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftdriver.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftdriver.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftdriver.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftgloadr.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftgloadr.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftgloadr.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftgloadr.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftmemory.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftmemory.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftmemory.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftmemory.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftobjs.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftobjs.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftobjs.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftobjs.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftpic.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftpic.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftpic.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftpic.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftrfork.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftrfork.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftrfork.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftrfork.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftserv.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftserv.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftserv.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftserv.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftstream.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftstream.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftstream.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftstream.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/fttrace.h b/contrib/network/netsurf/dependencies/include/freetype/internal/fttrace.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/fttrace.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/fttrace.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/ftvalid.h b/contrib/network/netsurf/dependencies/include/freetype/internal/ftvalid.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/ftvalid.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/ftvalid.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/internal.h b/contrib/network/netsurf/dependencies/include/freetype/internal/internal.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/internal.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/internal.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/pcftypes.h b/contrib/network/netsurf/dependencies/include/freetype/internal/pcftypes.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/pcftypes.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/pcftypes.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/psaux.h b/contrib/network/netsurf/dependencies/include/freetype/internal/psaux.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/psaux.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/psaux.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/pshints.h b/contrib/network/netsurf/dependencies/include/freetype/internal/pshints.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/pshints.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/pshints.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svbdf.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svbdf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svbdf.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svbdf.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svcid.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svcid.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svcid.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svcid.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svgldict.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svgldict.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svgldict.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svgldict.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svgxval.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svgxval.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svgxval.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svgxval.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svkern.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svkern.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svkern.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svkern.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svmm.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svmm.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svmm.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svmm.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svotval.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svotval.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svotval.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svotval.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svpfr.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svpfr.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svpfr.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svpfr.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svpostnm.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svpostnm.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svpostnm.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svpostnm.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svpscmap.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svpscmap.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svpscmap.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svpscmap.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svpsinfo.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svpsinfo.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svpsinfo.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svpsinfo.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svsfnt.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svsfnt.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svsfnt.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svsfnt.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svttcmap.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svttcmap.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svttcmap.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svttcmap.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svtteng.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svtteng.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svtteng.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svtteng.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svttglyf.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svttglyf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svttglyf.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svttglyf.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svwinfnt.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svwinfnt.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svwinfnt.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svwinfnt.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/services/svxf86nm.h b/contrib/network/netsurf/dependencies/include/freetype/internal/services/svxf86nm.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/services/svxf86nm.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/services/svxf86nm.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/sfnt.h b/contrib/network/netsurf/dependencies/include/freetype/internal/sfnt.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/sfnt.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/sfnt.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/t1types.h b/contrib/network/netsurf/dependencies/include/freetype/internal/t1types.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/t1types.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/t1types.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/internal/tttypes.h b/contrib/network/netsurf/dependencies/include/freetype/internal/tttypes.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/internal/tttypes.h
rename to contrib/network/netsurf/dependencies/include/freetype/internal/tttypes.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/t1tables.h b/contrib/network/netsurf/dependencies/include/freetype/t1tables.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/t1tables.h
rename to contrib/network/netsurf/dependencies/include/freetype/t1tables.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttcache.h b/contrib/network/netsurf/dependencies/include/freetype/ttcache.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttcache.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttcache.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttcalc.h b/contrib/network/netsurf/dependencies/include/freetype/ttcalc.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttcalc.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttcalc.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttcmap.h b/contrib/network/netsurf/dependencies/include/freetype/ttcmap.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttcmap.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttcmap.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttconfig.h b/contrib/network/netsurf/dependencies/include/freetype/ttconfig.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttconfig.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttconfig.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttdebug.h b/contrib/network/netsurf/dependencies/include/freetype/ttdebug.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttdebug.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttdebug.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttengine.h b/contrib/network/netsurf/dependencies/include/freetype/ttengine.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttengine.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttengine.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttextend.h b/contrib/network/netsurf/dependencies/include/freetype/ttextend.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttextend.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttextend.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttfile.h b/contrib/network/netsurf/dependencies/include/freetype/ttfile.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttfile.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttfile.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttgload.h b/contrib/network/netsurf/dependencies/include/freetype/ttgload.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttgload.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttgload.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttinterp.h b/contrib/network/netsurf/dependencies/include/freetype/ttinterp.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttinterp.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttinterp.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttload.h b/contrib/network/netsurf/dependencies/include/freetype/ttload.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttload.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttload.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttmemory.h b/contrib/network/netsurf/dependencies/include/freetype/ttmemory.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttmemory.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttmemory.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttmutex.h b/contrib/network/netsurf/dependencies/include/freetype/ttmutex.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttmutex.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttmutex.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttnameid.h b/contrib/network/netsurf/dependencies/include/freetype/ttnameid.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttnameid.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttnameid.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttobjs.h b/contrib/network/netsurf/dependencies/include/freetype/ttobjs.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttobjs.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttobjs.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttraster.h b/contrib/network/netsurf/dependencies/include/freetype/ttraster.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttraster.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttraster.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/tttables.h b/contrib/network/netsurf/dependencies/include/freetype/tttables.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/tttables.h
rename to contrib/network/netsurf/dependencies/include/freetype/tttables.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/tttags.h b/contrib/network/netsurf/dependencies/include/freetype/tttags.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/tttags.h
rename to contrib/network/netsurf/dependencies/include/freetype/tttags.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/tttypes.h b/contrib/network/netsurf/dependencies/include/freetype/tttypes.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/tttypes.h
rename to contrib/network/netsurf/dependencies/include/freetype/tttypes.h
diff --git a/programs/network/netsurf/dependencies/include/freetype/ttunpat.h b/contrib/network/netsurf/dependencies/include/freetype/ttunpat.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/freetype/ttunpat.h
rename to contrib/network/netsurf/dependencies/include/freetype/ttunpat.h
diff --git a/programs/network/netsurf/dependencies/include/iconv.h b/contrib/network/netsurf/dependencies/include/iconv.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/iconv.h
rename to contrib/network/netsurf/dependencies/include/iconv.h
diff --git a/programs/network/netsurf/dependencies/include/jconfig.h b/contrib/network/netsurf/dependencies/include/jconfig.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/jconfig.h
rename to contrib/network/netsurf/dependencies/include/jconfig.h
diff --git a/programs/network/netsurf/dependencies/include/jmorecfg.h b/contrib/network/netsurf/dependencies/include/jmorecfg.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/jmorecfg.h
rename to contrib/network/netsurf/dependencies/include/jmorecfg.h
diff --git a/programs/network/netsurf/dependencies/include/jpeglib.h b/contrib/network/netsurf/dependencies/include/jpeglib.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/jpeglib.h
rename to contrib/network/netsurf/dependencies/include/jpeglib.h
diff --git a/programs/network/netsurf/dependencies/include/png.h b/contrib/network/netsurf/dependencies/include/png.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/png.h
rename to contrib/network/netsurf/dependencies/include/png.h
diff --git a/programs/network/netsurf/dependencies/include/pngconf.h b/contrib/network/netsurf/dependencies/include/pngconf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/pngconf.h
rename to contrib/network/netsurf/dependencies/include/pngconf.h
diff --git a/programs/network/netsurf/dependencies/include/pngdebug.h b/contrib/network/netsurf/dependencies/include/pngdebug.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/pngdebug.h
rename to contrib/network/netsurf/dependencies/include/pngdebug.h
diff --git a/programs/network/netsurf/dependencies/include/pnginfo.h b/contrib/network/netsurf/dependencies/include/pnginfo.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/pnginfo.h
rename to contrib/network/netsurf/dependencies/include/pnginfo.h
diff --git a/programs/network/netsurf/dependencies/include/pnglibconf.h b/contrib/network/netsurf/dependencies/include/pnglibconf.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/pnglibconf.h
rename to contrib/network/netsurf/dependencies/include/pnglibconf.h
diff --git a/programs/network/netsurf/dependencies/include/pngpriv.h b/contrib/network/netsurf/dependencies/include/pngpriv.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/pngpriv.h
rename to contrib/network/netsurf/dependencies/include/pngpriv.h
diff --git a/programs/network/netsurf/dependencies/include/pngstruct.h b/contrib/network/netsurf/dependencies/include/pngstruct.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/pngstruct.h
rename to contrib/network/netsurf/dependencies/include/pngstruct.h
diff --git a/programs/network/netsurf/dependencies/include/zlib.h b/contrib/network/netsurf/dependencies/include/zlib.h
similarity index 100%
rename from programs/network/netsurf/dependencies/include/zlib.h
rename to contrib/network/netsurf/dependencies/include/zlib.h
diff --git a/programs/network/netsurf/dependencies/lib/libSDL.a b/contrib/network/netsurf/dependencies/lib/libSDL.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libSDL.a
rename to contrib/network/netsurf/dependencies/lib/libSDL.a
diff --git a/programs/network/netsurf/dependencies/lib/libcss.a b/contrib/network/netsurf/dependencies/lib/libcss.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libcss.a
rename to contrib/network/netsurf/dependencies/lib/libcss.a
diff --git a/programs/network/netsurf/dependencies/lib/libcurl.a b/contrib/network/netsurf/dependencies/lib/libcurl.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libcurl.a
rename to contrib/network/netsurf/dependencies/lib/libcurl.a
diff --git a/programs/network/netsurf/dependencies/lib/libdom.a b/contrib/network/netsurf/dependencies/lib/libdom.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libdom.a
rename to contrib/network/netsurf/dependencies/lib/libdom.a
diff --git a/programs/network/netsurf/dependencies/lib/libfreetype2.a b/contrib/network/netsurf/dependencies/lib/libfreetype2.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libfreetype2.a
rename to contrib/network/netsurf/dependencies/lib/libfreetype2.a
diff --git a/programs/network/netsurf/dependencies/lib/libhubbub.a b/contrib/network/netsurf/dependencies/lib/libhubbub.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libhubbub.a
rename to contrib/network/netsurf/dependencies/lib/libhubbub.a
diff --git a/programs/network/netsurf/dependencies/lib/libiconv.a b/contrib/network/netsurf/dependencies/lib/libiconv.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libiconv.a
rename to contrib/network/netsurf/dependencies/lib/libiconv.a
diff --git a/programs/network/netsurf/dependencies/lib/libjpeg.a b/contrib/network/netsurf/dependencies/lib/libjpeg.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libjpeg.a
rename to contrib/network/netsurf/dependencies/lib/libjpeg.a
diff --git a/programs/network/netsurf/dependencies/lib/libnsbmp.a b/contrib/network/netsurf/dependencies/lib/libnsbmp.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libnsbmp.a
rename to contrib/network/netsurf/dependencies/lib/libnsbmp.a
diff --git a/programs/network/netsurf/dependencies/lib/libnsfb.a b/contrib/network/netsurf/dependencies/lib/libnsfb.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libnsfb.a
rename to contrib/network/netsurf/dependencies/lib/libnsfb.a
diff --git a/programs/network/netsurf/dependencies/lib/libnsgif.a b/contrib/network/netsurf/dependencies/lib/libnsgif.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libnsgif.a
rename to contrib/network/netsurf/dependencies/lib/libnsgif.a
diff --git a/programs/network/netsurf/dependencies/lib/libparserutils.a b/contrib/network/netsurf/dependencies/lib/libparserutils.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libparserutils.a
rename to contrib/network/netsurf/dependencies/lib/libparserutils.a
diff --git a/programs/network/netsurf/dependencies/lib/libpng.a b/contrib/network/netsurf/dependencies/lib/libpng.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libpng.a
rename to contrib/network/netsurf/dependencies/lib/libpng.a
diff --git a/programs/network/netsurf/dependencies/lib/libwapcaplet.a b/contrib/network/netsurf/dependencies/lib/libwapcaplet.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libwapcaplet.a
rename to contrib/network/netsurf/dependencies/lib/libwapcaplet.a
diff --git a/programs/network/netsurf/dependencies/lib/libz.a b/contrib/network/netsurf/dependencies/lib/libz.a
similarity index 100%
rename from programs/network/netsurf/dependencies/lib/libz.a
rename to contrib/network/netsurf/dependencies/lib/libz.a
diff --git a/programs/network/netsurf/include/cursor.h b/contrib/network/netsurf/include/cursor.h
similarity index 100%
rename from programs/network/netsurf/include/cursor.h
rename to contrib/network/netsurf/include/cursor.h
diff --git a/programs/network/netsurf/include/dom/bindings/hubbub/errors.h b/contrib/network/netsurf/include/dom/bindings/hubbub/errors.h
similarity index 100%
rename from programs/network/netsurf/include/dom/bindings/hubbub/errors.h
rename to contrib/network/netsurf/include/dom/bindings/hubbub/errors.h
diff --git a/programs/network/netsurf/include/dom/bindings/hubbub/parser.h b/contrib/network/netsurf/include/dom/bindings/hubbub/parser.h
similarity index 100%
rename from programs/network/netsurf/include/dom/bindings/hubbub/parser.h
rename to contrib/network/netsurf/include/dom/bindings/hubbub/parser.h
diff --git a/programs/network/netsurf/include/dom/bindings/xml/xmlerror.h b/contrib/network/netsurf/include/dom/bindings/xml/xmlerror.h
similarity index 100%
rename from programs/network/netsurf/include/dom/bindings/xml/xmlerror.h
rename to contrib/network/netsurf/include/dom/bindings/xml/xmlerror.h
diff --git a/programs/network/netsurf/include/dom/bindings/xml/xmlparser.h b/contrib/network/netsurf/include/dom/bindings/xml/xmlparser.h
similarity index 100%
rename from programs/network/netsurf/include/dom/bindings/xml/xmlparser.h
rename to contrib/network/netsurf/include/dom/bindings/xml/xmlparser.h
diff --git a/programs/network/netsurf/include/dom/core/attr.h b/contrib/network/netsurf/include/dom/core/attr.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/attr.h
rename to contrib/network/netsurf/include/dom/core/attr.h
diff --git a/programs/network/netsurf/include/dom/core/cdatasection.h b/contrib/network/netsurf/include/dom/core/cdatasection.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/cdatasection.h
rename to contrib/network/netsurf/include/dom/core/cdatasection.h
diff --git a/programs/network/netsurf/include/dom/core/characterdata.h b/contrib/network/netsurf/include/dom/core/characterdata.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/characterdata.h
rename to contrib/network/netsurf/include/dom/core/characterdata.h
diff --git a/programs/network/netsurf/include/dom/core/comment.h b/contrib/network/netsurf/include/dom/core/comment.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/comment.h
rename to contrib/network/netsurf/include/dom/core/comment.h
diff --git a/programs/network/netsurf/include/dom/core/doc_fragment.h b/contrib/network/netsurf/include/dom/core/doc_fragment.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/doc_fragment.h
rename to contrib/network/netsurf/include/dom/core/doc_fragment.h
diff --git a/programs/network/netsurf/include/dom/core/document.h b/contrib/network/netsurf/include/dom/core/document.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/document.h
rename to contrib/network/netsurf/include/dom/core/document.h
diff --git a/programs/network/netsurf/include/dom/core/document_type.h b/contrib/network/netsurf/include/dom/core/document_type.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/document_type.h
rename to contrib/network/netsurf/include/dom/core/document_type.h
diff --git a/programs/network/netsurf/include/dom/core/element.h b/contrib/network/netsurf/include/dom/core/element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/element.h
rename to contrib/network/netsurf/include/dom/core/element.h
diff --git a/programs/network/netsurf/include/dom/core/entity_ref.h b/contrib/network/netsurf/include/dom/core/entity_ref.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/entity_ref.h
rename to contrib/network/netsurf/include/dom/core/entity_ref.h
diff --git a/programs/network/netsurf/include/dom/core/exceptions.h b/contrib/network/netsurf/include/dom/core/exceptions.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/exceptions.h
rename to contrib/network/netsurf/include/dom/core/exceptions.h
diff --git a/programs/network/netsurf/include/dom/core/implementation.h b/contrib/network/netsurf/include/dom/core/implementation.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/implementation.h
rename to contrib/network/netsurf/include/dom/core/implementation.h
diff --git a/programs/network/netsurf/include/dom/core/namednodemap.h b/contrib/network/netsurf/include/dom/core/namednodemap.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/namednodemap.h
rename to contrib/network/netsurf/include/dom/core/namednodemap.h
diff --git a/programs/network/netsurf/include/dom/core/node.h b/contrib/network/netsurf/include/dom/core/node.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/node.h
rename to contrib/network/netsurf/include/dom/core/node.h
diff --git a/programs/network/netsurf/include/dom/core/nodelist.h b/contrib/network/netsurf/include/dom/core/nodelist.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/nodelist.h
rename to contrib/network/netsurf/include/dom/core/nodelist.h
diff --git a/programs/network/netsurf/include/dom/core/pi.h b/contrib/network/netsurf/include/dom/core/pi.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/pi.h
rename to contrib/network/netsurf/include/dom/core/pi.h
diff --git a/programs/network/netsurf/include/dom/core/string.h b/contrib/network/netsurf/include/dom/core/string.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/string.h
rename to contrib/network/netsurf/include/dom/core/string.h
diff --git a/programs/network/netsurf/include/dom/core/text.h b/contrib/network/netsurf/include/dom/core/text.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/text.h
rename to contrib/network/netsurf/include/dom/core/text.h
diff --git a/programs/network/netsurf/include/dom/core/typeinfo.h b/contrib/network/netsurf/include/dom/core/typeinfo.h
similarity index 100%
rename from programs/network/netsurf/include/dom/core/typeinfo.h
rename to contrib/network/netsurf/include/dom/core/typeinfo.h
diff --git a/programs/network/netsurf/include/dom/dom.h b/contrib/network/netsurf/include/dom/dom.h
similarity index 100%
rename from programs/network/netsurf/include/dom/dom.h
rename to contrib/network/netsurf/include/dom/dom.h
diff --git a/programs/network/netsurf/include/dom/events/custom_event.h b/contrib/network/netsurf/include/dom/events/custom_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/custom_event.h
rename to contrib/network/netsurf/include/dom/events/custom_event.h
diff --git a/programs/network/netsurf/include/dom/events/document_event.h b/contrib/network/netsurf/include/dom/events/document_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/document_event.h
rename to contrib/network/netsurf/include/dom/events/document_event.h
diff --git a/programs/network/netsurf/include/dom/events/event.h b/contrib/network/netsurf/include/dom/events/event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/event.h
rename to contrib/network/netsurf/include/dom/events/event.h
diff --git a/programs/network/netsurf/include/dom/events/event_listener.h b/contrib/network/netsurf/include/dom/events/event_listener.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/event_listener.h
rename to contrib/network/netsurf/include/dom/events/event_listener.h
diff --git a/programs/network/netsurf/include/dom/events/event_target.h b/contrib/network/netsurf/include/dom/events/event_target.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/event_target.h
rename to contrib/network/netsurf/include/dom/events/event_target.h
diff --git a/programs/network/netsurf/include/dom/events/events.h b/contrib/network/netsurf/include/dom/events/events.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/events.h
rename to contrib/network/netsurf/include/dom/events/events.h
diff --git a/programs/network/netsurf/include/dom/events/keyboard_event.h b/contrib/network/netsurf/include/dom/events/keyboard_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/keyboard_event.h
rename to contrib/network/netsurf/include/dom/events/keyboard_event.h
diff --git a/programs/network/netsurf/include/dom/events/mouse_event.h b/contrib/network/netsurf/include/dom/events/mouse_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/mouse_event.h
rename to contrib/network/netsurf/include/dom/events/mouse_event.h
diff --git a/programs/network/netsurf/include/dom/events/mouse_multi_wheel_event.h b/contrib/network/netsurf/include/dom/events/mouse_multi_wheel_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/mouse_multi_wheel_event.h
rename to contrib/network/netsurf/include/dom/events/mouse_multi_wheel_event.h
diff --git a/programs/network/netsurf/include/dom/events/mouse_wheel_event.h b/contrib/network/netsurf/include/dom/events/mouse_wheel_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/mouse_wheel_event.h
rename to contrib/network/netsurf/include/dom/events/mouse_wheel_event.h
diff --git a/programs/network/netsurf/include/dom/events/mutation_event.h b/contrib/network/netsurf/include/dom/events/mutation_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/mutation_event.h
rename to contrib/network/netsurf/include/dom/events/mutation_event.h
diff --git a/programs/network/netsurf/include/dom/events/mutation_name_event.h b/contrib/network/netsurf/include/dom/events/mutation_name_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/mutation_name_event.h
rename to contrib/network/netsurf/include/dom/events/mutation_name_event.h
diff --git a/programs/network/netsurf/include/dom/events/text_event.h b/contrib/network/netsurf/include/dom/events/text_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/text_event.h
rename to contrib/network/netsurf/include/dom/events/text_event.h
diff --git a/programs/network/netsurf/include/dom/events/ui_event.h b/contrib/network/netsurf/include/dom/events/ui_event.h
similarity index 100%
rename from programs/network/netsurf/include/dom/events/ui_event.h
rename to contrib/network/netsurf/include/dom/events/ui_event.h
diff --git a/programs/network/netsurf/include/dom/functypes.h b/contrib/network/netsurf/include/dom/functypes.h
similarity index 100%
rename from programs/network/netsurf/include/dom/functypes.h
rename to contrib/network/netsurf/include/dom/functypes.h
diff --git a/programs/network/netsurf/include/dom/html/html_body_element.h b/contrib/network/netsurf/include/dom/html/html_body_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_body_element.h
rename to contrib/network/netsurf/include/dom/html/html_body_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_button_element.h b/contrib/network/netsurf/include/dom/html/html_button_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_button_element.h
rename to contrib/network/netsurf/include/dom/html/html_button_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_collection.h b/contrib/network/netsurf/include/dom/html/html_collection.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_collection.h
rename to contrib/network/netsurf/include/dom/html/html_collection.h
diff --git a/programs/network/netsurf/include/dom/html/html_document.h b/contrib/network/netsurf/include/dom/html/html_document.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_document.h
rename to contrib/network/netsurf/include/dom/html/html_document.h
diff --git a/programs/network/netsurf/include/dom/html/html_element.h b/contrib/network/netsurf/include/dom/html/html_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_element.h
rename to contrib/network/netsurf/include/dom/html/html_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_form_element.h b/contrib/network/netsurf/include/dom/html/html_form_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_form_element.h
rename to contrib/network/netsurf/include/dom/html/html_form_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_head_element.h b/contrib/network/netsurf/include/dom/html/html_head_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_head_element.h
rename to contrib/network/netsurf/include/dom/html/html_head_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_html_element.h b/contrib/network/netsurf/include/dom/html/html_html_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_html_element.h
rename to contrib/network/netsurf/include/dom/html/html_html_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_input_element.h b/contrib/network/netsurf/include/dom/html/html_input_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_input_element.h
rename to contrib/network/netsurf/include/dom/html/html_input_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_link_element.h b/contrib/network/netsurf/include/dom/html/html_link_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_link_element.h
rename to contrib/network/netsurf/include/dom/html/html_link_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_meta_element.h b/contrib/network/netsurf/include/dom/html/html_meta_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_meta_element.h
rename to contrib/network/netsurf/include/dom/html/html_meta_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_opt_group_element.h b/contrib/network/netsurf/include/dom/html/html_opt_group_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_opt_group_element.h
rename to contrib/network/netsurf/include/dom/html/html_opt_group_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_option_element.h b/contrib/network/netsurf/include/dom/html/html_option_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_option_element.h
rename to contrib/network/netsurf/include/dom/html/html_option_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_select_element.h b/contrib/network/netsurf/include/dom/html/html_select_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_select_element.h
rename to contrib/network/netsurf/include/dom/html/html_select_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_text_area_element.h b/contrib/network/netsurf/include/dom/html/html_text_area_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_text_area_element.h
rename to contrib/network/netsurf/include/dom/html/html_text_area_element.h
diff --git a/programs/network/netsurf/include/dom/html/html_title_element.h b/contrib/network/netsurf/include/dom/html/html_title_element.h
similarity index 100%
rename from programs/network/netsurf/include/dom/html/html_title_element.h
rename to contrib/network/netsurf/include/dom/html/html_title_element.h
diff --git a/programs/network/netsurf/include/hubbub/errors.h b/contrib/network/netsurf/include/hubbub/errors.h
similarity index 100%
rename from programs/network/netsurf/include/hubbub/errors.h
rename to contrib/network/netsurf/include/hubbub/errors.h
diff --git a/programs/network/netsurf/include/hubbub/functypes.h b/contrib/network/netsurf/include/hubbub/functypes.h
similarity index 100%
rename from programs/network/netsurf/include/hubbub/functypes.h
rename to contrib/network/netsurf/include/hubbub/functypes.h
diff --git a/programs/network/netsurf/include/hubbub/hubbub.h b/contrib/network/netsurf/include/hubbub/hubbub.h
similarity index 100%
rename from programs/network/netsurf/include/hubbub/hubbub.h
rename to contrib/network/netsurf/include/hubbub/hubbub.h
diff --git a/programs/network/netsurf/include/hubbub/parser.h b/contrib/network/netsurf/include/hubbub/parser.h
similarity index 100%
rename from programs/network/netsurf/include/hubbub/parser.h
rename to contrib/network/netsurf/include/hubbub/parser.h
diff --git a/programs/network/netsurf/include/hubbub/tree.h b/contrib/network/netsurf/include/hubbub/tree.h
similarity index 100%
rename from programs/network/netsurf/include/hubbub/tree.h
rename to contrib/network/netsurf/include/hubbub/tree.h
diff --git a/programs/network/netsurf/include/hubbub/types.h b/contrib/network/netsurf/include/hubbub/types.h
similarity index 100%
rename from programs/network/netsurf/include/hubbub/types.h
rename to contrib/network/netsurf/include/hubbub/types.h
diff --git a/programs/network/netsurf/include/libcss/computed.h b/contrib/network/netsurf/include/libcss/computed.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/computed.h
rename to contrib/network/netsurf/include/libcss/computed.h
diff --git a/programs/network/netsurf/include/libcss/errors.h b/contrib/network/netsurf/include/libcss/errors.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/errors.h
rename to contrib/network/netsurf/include/libcss/errors.h
diff --git a/programs/network/netsurf/include/libcss/font_face.h b/contrib/network/netsurf/include/libcss/font_face.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/font_face.h
rename to contrib/network/netsurf/include/libcss/font_face.h
diff --git a/programs/network/netsurf/include/libcss/fpmath.h b/contrib/network/netsurf/include/libcss/fpmath.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/fpmath.h
rename to contrib/network/netsurf/include/libcss/fpmath.h
diff --git a/programs/network/netsurf/include/libcss/functypes.h b/contrib/network/netsurf/include/libcss/functypes.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/functypes.h
rename to contrib/network/netsurf/include/libcss/functypes.h
diff --git a/programs/network/netsurf/include/libcss/hint.h b/contrib/network/netsurf/include/libcss/hint.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/hint.h
rename to contrib/network/netsurf/include/libcss/hint.h
diff --git a/programs/network/netsurf/include/libcss/libcss.h b/contrib/network/netsurf/include/libcss/libcss.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/libcss.h
rename to contrib/network/netsurf/include/libcss/libcss.h
diff --git a/programs/network/netsurf/include/libcss/properties.h b/contrib/network/netsurf/include/libcss/properties.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/properties.h
rename to contrib/network/netsurf/include/libcss/properties.h
diff --git a/programs/network/netsurf/include/libcss/select.h b/contrib/network/netsurf/include/libcss/select.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/select.h
rename to contrib/network/netsurf/include/libcss/select.h
diff --git a/programs/network/netsurf/include/libcss/stylesheet.h b/contrib/network/netsurf/include/libcss/stylesheet.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/stylesheet.h
rename to contrib/network/netsurf/include/libcss/stylesheet.h
diff --git a/programs/network/netsurf/include/libcss/types.h b/contrib/network/netsurf/include/libcss/types.h
similarity index 100%
rename from programs/network/netsurf/include/libcss/types.h
rename to contrib/network/netsurf/include/libcss/types.h
diff --git a/programs/network/netsurf/include/libnsbmp.h b/contrib/network/netsurf/include/libnsbmp.h
similarity index 100%
rename from programs/network/netsurf/include/libnsbmp.h
rename to contrib/network/netsurf/include/libnsbmp.h
diff --git a/programs/network/netsurf/include/libnsfb.h b/contrib/network/netsurf/include/libnsfb.h
similarity index 100%
rename from programs/network/netsurf/include/libnsfb.h
rename to contrib/network/netsurf/include/libnsfb.h
diff --git a/programs/network/netsurf/include/libnsfb_cursor.h b/contrib/network/netsurf/include/libnsfb_cursor.h
similarity index 100%
rename from programs/network/netsurf/include/libnsfb_cursor.h
rename to contrib/network/netsurf/include/libnsfb_cursor.h
diff --git a/programs/network/netsurf/include/libnsfb_event.h b/contrib/network/netsurf/include/libnsfb_event.h
similarity index 100%
rename from programs/network/netsurf/include/libnsfb_event.h
rename to contrib/network/netsurf/include/libnsfb_event.h
diff --git a/programs/network/netsurf/include/libnsfb_plot.h b/contrib/network/netsurf/include/libnsfb_plot.h
similarity index 100%
rename from programs/network/netsurf/include/libnsfb_plot.h
rename to contrib/network/netsurf/include/libnsfb_plot.h
diff --git a/programs/network/netsurf/include/libnsfb_plot_util.h b/contrib/network/netsurf/include/libnsfb_plot_util.h
similarity index 100%
rename from programs/network/netsurf/include/libnsfb_plot_util.h
rename to contrib/network/netsurf/include/libnsfb_plot_util.h
diff --git a/programs/network/netsurf/include/libnsgif.h b/contrib/network/netsurf/include/libnsgif.h
similarity index 100%
rename from programs/network/netsurf/include/libnsgif.h
rename to contrib/network/netsurf/include/libnsgif.h
diff --git a/programs/network/netsurf/include/libwapcaplet/libwapcaplet.h b/contrib/network/netsurf/include/libwapcaplet/libwapcaplet.h
similarity index 100%
rename from programs/network/netsurf/include/libwapcaplet/libwapcaplet.h
rename to contrib/network/netsurf/include/libwapcaplet/libwapcaplet.h
diff --git a/programs/network/netsurf/include/nsfb.h b/contrib/network/netsurf/include/nsfb.h
similarity index 100%
rename from programs/network/netsurf/include/nsfb.h
rename to contrib/network/netsurf/include/nsfb.h
diff --git a/programs/network/netsurf/include/palette.h b/contrib/network/netsurf/include/palette.h
similarity index 100%
rename from programs/network/netsurf/include/palette.h
rename to contrib/network/netsurf/include/palette.h
diff --git a/programs/network/netsurf/include/parserutils/charset/codec.h b/contrib/network/netsurf/include/parserutils/charset/codec.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/charset/codec.h
rename to contrib/network/netsurf/include/parserutils/charset/codec.h
diff --git a/programs/network/netsurf/include/parserutils/charset/mibenum.h b/contrib/network/netsurf/include/parserutils/charset/mibenum.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/charset/mibenum.h
rename to contrib/network/netsurf/include/parserutils/charset/mibenum.h
diff --git a/programs/network/netsurf/include/parserutils/charset/utf16.h b/contrib/network/netsurf/include/parserutils/charset/utf16.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/charset/utf16.h
rename to contrib/network/netsurf/include/parserutils/charset/utf16.h
diff --git a/programs/network/netsurf/include/parserutils/charset/utf8.h b/contrib/network/netsurf/include/parserutils/charset/utf8.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/charset/utf8.h
rename to contrib/network/netsurf/include/parserutils/charset/utf8.h
diff --git a/programs/network/netsurf/include/parserutils/errors.h b/contrib/network/netsurf/include/parserutils/errors.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/errors.h
rename to contrib/network/netsurf/include/parserutils/errors.h
diff --git a/programs/network/netsurf/include/parserutils/functypes.h b/contrib/network/netsurf/include/parserutils/functypes.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/functypes.h
rename to contrib/network/netsurf/include/parserutils/functypes.h
diff --git a/programs/network/netsurf/include/parserutils/input/inputstream.h b/contrib/network/netsurf/include/parserutils/input/inputstream.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/input/inputstream.h
rename to contrib/network/netsurf/include/parserutils/input/inputstream.h
diff --git a/programs/network/netsurf/include/parserutils/parserutils.h b/contrib/network/netsurf/include/parserutils/parserutils.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/parserutils.h
rename to contrib/network/netsurf/include/parserutils/parserutils.h
diff --git a/programs/network/netsurf/include/parserutils/types.h b/contrib/network/netsurf/include/parserutils/types.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/types.h
rename to contrib/network/netsurf/include/parserutils/types.h
diff --git a/programs/network/netsurf/include/parserutils/utils/buffer.h b/contrib/network/netsurf/include/parserutils/utils/buffer.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/utils/buffer.h
rename to contrib/network/netsurf/include/parserutils/utils/buffer.h
diff --git a/programs/network/netsurf/include/parserutils/utils/stack.h b/contrib/network/netsurf/include/parserutils/utils/stack.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/utils/stack.h
rename to contrib/network/netsurf/include/parserutils/utils/stack.h
diff --git a/programs/network/netsurf/include/parserutils/utils/vector.h b/contrib/network/netsurf/include/parserutils/utils/vector.h
similarity index 100%
rename from programs/network/netsurf/include/parserutils/utils/vector.h
rename to contrib/network/netsurf/include/parserutils/utils/vector.h
diff --git a/programs/network/netsurf/include/plot.h b/contrib/network/netsurf/include/plot.h
similarity index 100%
rename from programs/network/netsurf/include/plot.h
rename to contrib/network/netsurf/include/plot.h
diff --git a/programs/network/netsurf/include/surface.h b/contrib/network/netsurf/include/surface.h
similarity index 100%
rename from programs/network/netsurf/include/surface.h
rename to contrib/network/netsurf/include/surface.h
diff --git a/programs/network/netsurf/libcss/.gitignore b/contrib/network/netsurf/libcss/.gitignore
similarity index 100%
rename from programs/network/netsurf/libcss/.gitignore
rename to contrib/network/netsurf/libcss/.gitignore
diff --git a/programs/network/netsurf/libcss/COPYING b/contrib/network/netsurf/libcss/COPYING
similarity index 100%
rename from programs/network/netsurf/libcss/COPYING
rename to contrib/network/netsurf/libcss/COPYING
diff --git a/programs/network/netsurf/libcss/Makefile b/contrib/network/netsurf/libcss/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/Makefile
rename to contrib/network/netsurf/libcss/Makefile
diff --git a/programs/network/netsurf/libcss/Makefile.config b/contrib/network/netsurf/libcss/Makefile.config
similarity index 100%
rename from programs/network/netsurf/libcss/Makefile.config
rename to contrib/network/netsurf/libcss/Makefile.config
diff --git a/programs/network/netsurf/libcss/README b/contrib/network/netsurf/libcss/README
similarity index 100%
rename from programs/network/netsurf/libcss/README
rename to contrib/network/netsurf/libcss/README
diff --git a/programs/network/netsurf/libcss/build/mkprops.pl b/contrib/network/netsurf/libcss/build/mkprops.pl
similarity index 100%
rename from programs/network/netsurf/libcss/build/mkprops.pl
rename to contrib/network/netsurf/libcss/build/mkprops.pl
diff --git a/programs/network/netsurf/libcss/docs/API b/contrib/network/netsurf/libcss/docs/API
similarity index 100%
rename from programs/network/netsurf/libcss/docs/API
rename to contrib/network/netsurf/libcss/docs/API
diff --git a/programs/network/netsurf/libcss/docs/Bytecode b/contrib/network/netsurf/libcss/docs/Bytecode
similarity index 100%
rename from programs/network/netsurf/libcss/docs/Bytecode
rename to contrib/network/netsurf/libcss/docs/Bytecode
diff --git a/programs/network/netsurf/libcss/docs/Colour b/contrib/network/netsurf/libcss/docs/Colour
similarity index 100%
rename from programs/network/netsurf/libcss/docs/Colour
rename to contrib/network/netsurf/libcss/docs/Colour
diff --git a/programs/network/netsurf/libcss/docs/Grammar b/contrib/network/netsurf/libcss/docs/Grammar
similarity index 100%
rename from programs/network/netsurf/libcss/docs/Grammar
rename to contrib/network/netsurf/libcss/docs/Grammar
diff --git a/programs/network/netsurf/libcss/docs/Lexer b/contrib/network/netsurf/libcss/docs/Lexer
similarity index 100%
rename from programs/network/netsurf/libcss/docs/Lexer
rename to contrib/network/netsurf/libcss/docs/Lexer
diff --git a/programs/network/netsurf/libcss/docs/Representation b/contrib/network/netsurf/libcss/docs/Representation
similarity index 100%
rename from programs/network/netsurf/libcss/docs/Representation
rename to contrib/network/netsurf/libcss/docs/Representation
diff --git a/programs/network/netsurf/libcss/docs/Tokens b/contrib/network/netsurf/libcss/docs/Tokens
similarity index 100%
rename from programs/network/netsurf/libcss/docs/Tokens
rename to contrib/network/netsurf/libcss/docs/Tokens
diff --git a/programs/network/netsurf/libcss/examples/example1.c b/contrib/network/netsurf/libcss/examples/example1.c
similarity index 100%
rename from programs/network/netsurf/libcss/examples/example1.c
rename to contrib/network/netsurf/libcss/examples/example1.c
diff --git a/programs/network/netsurf/libcss/examples/style.css b/contrib/network/netsurf/libcss/examples/style.css
similarity index 100%
rename from programs/network/netsurf/libcss/examples/style.css
rename to contrib/network/netsurf/libcss/examples/style.css
diff --git a/programs/network/netsurf/libcss/include/libcss/computed.h b/contrib/network/netsurf/libcss/include/libcss/computed.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/computed.h
rename to contrib/network/netsurf/libcss/include/libcss/computed.h
diff --git a/programs/network/netsurf/libcss/include/libcss/errors.h b/contrib/network/netsurf/libcss/include/libcss/errors.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/errors.h
rename to contrib/network/netsurf/libcss/include/libcss/errors.h
diff --git a/programs/network/netsurf/libcss/include/libcss/font_face.h b/contrib/network/netsurf/libcss/include/libcss/font_face.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/font_face.h
rename to contrib/network/netsurf/libcss/include/libcss/font_face.h
diff --git a/programs/network/netsurf/libcss/include/libcss/fpmath.h b/contrib/network/netsurf/libcss/include/libcss/fpmath.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/fpmath.h
rename to contrib/network/netsurf/libcss/include/libcss/fpmath.h
diff --git a/programs/network/netsurf/libcss/include/libcss/functypes.h b/contrib/network/netsurf/libcss/include/libcss/functypes.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/functypes.h
rename to contrib/network/netsurf/libcss/include/libcss/functypes.h
diff --git a/programs/network/netsurf/libcss/include/libcss/hint.h b/contrib/network/netsurf/libcss/include/libcss/hint.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/hint.h
rename to contrib/network/netsurf/libcss/include/libcss/hint.h
diff --git a/programs/network/netsurf/libcss/include/libcss/libcss.h b/contrib/network/netsurf/libcss/include/libcss/libcss.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/libcss.h
rename to contrib/network/netsurf/libcss/include/libcss/libcss.h
diff --git a/programs/network/netsurf/libcss/include/libcss/properties.h b/contrib/network/netsurf/libcss/include/libcss/properties.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/properties.h
rename to contrib/network/netsurf/libcss/include/libcss/properties.h
diff --git a/programs/network/netsurf/libcss/include/libcss/select.h b/contrib/network/netsurf/libcss/include/libcss/select.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/select.h
rename to contrib/network/netsurf/libcss/include/libcss/select.h
diff --git a/programs/network/netsurf/libcss/include/libcss/stylesheet.h b/contrib/network/netsurf/libcss/include/libcss/stylesheet.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/stylesheet.h
rename to contrib/network/netsurf/libcss/include/libcss/stylesheet.h
diff --git a/programs/network/netsurf/libcss/include/libcss/types.h b/contrib/network/netsurf/libcss/include/libcss/types.h
similarity index 100%
rename from programs/network/netsurf/libcss/include/libcss/types.h
rename to contrib/network/netsurf/libcss/include/libcss/types.h
diff --git a/programs/network/netsurf/libcss/libcss.pc.in b/contrib/network/netsurf/libcss/libcss.pc.in
similarity index 100%
rename from programs/network/netsurf/libcss/libcss.pc.in
rename to contrib/network/netsurf/libcss/libcss.pc.in
diff --git a/programs/network/netsurf/libcss/src/Makefile b/contrib/network/netsurf/libcss/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/Makefile
rename to contrib/network/netsurf/libcss/src/Makefile
diff --git a/programs/network/netsurf/libcss/src/bytecode/Makefile b/contrib/network/netsurf/libcss/src/bytecode/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/bytecode/Makefile
rename to contrib/network/netsurf/libcss/src/bytecode/Makefile
diff --git a/programs/network/netsurf/libcss/src/bytecode/bytecode.h b/contrib/network/netsurf/libcss/src/bytecode/bytecode.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/bytecode/bytecode.h
rename to contrib/network/netsurf/libcss/src/bytecode/bytecode.h
diff --git a/programs/network/netsurf/libcss/src/bytecode/opcodes.h b/contrib/network/netsurf/libcss/src/bytecode/opcodes.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/bytecode/opcodes.h
rename to contrib/network/netsurf/libcss/src/bytecode/opcodes.h
diff --git a/programs/network/netsurf/libcss/src/charset/Makefile b/contrib/network/netsurf/libcss/src/charset/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/charset/Makefile
rename to contrib/network/netsurf/libcss/src/charset/Makefile
diff --git a/programs/network/netsurf/libcss/src/charset/detect.c b/contrib/network/netsurf/libcss/src/charset/detect.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/charset/detect.c
rename to contrib/network/netsurf/libcss/src/charset/detect.c
diff --git a/programs/network/netsurf/libcss/src/charset/detect.h b/contrib/network/netsurf/libcss/src/charset/detect.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/charset/detect.h
rename to contrib/network/netsurf/libcss/src/charset/detect.h
diff --git a/programs/network/netsurf/libcss/src/lex/Makefile b/contrib/network/netsurf/libcss/src/lex/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/lex/Makefile
rename to contrib/network/netsurf/libcss/src/lex/Makefile
diff --git a/programs/network/netsurf/libcss/src/lex/lex.c b/contrib/network/netsurf/libcss/src/lex/lex.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/lex/lex.c
rename to contrib/network/netsurf/libcss/src/lex/lex.c
diff --git a/programs/network/netsurf/libcss/src/lex/lex.h b/contrib/network/netsurf/libcss/src/lex/lex.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/lex/lex.h
rename to contrib/network/netsurf/libcss/src/lex/lex.h
diff --git a/programs/network/netsurf/libcss/src/parse/Makefile b/contrib/network/netsurf/libcss/src/parse/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/Makefile
rename to contrib/network/netsurf/libcss/src/parse/Makefile
diff --git a/programs/network/netsurf/libcss/src/parse/font_face.c b/contrib/network/netsurf/libcss/src/parse/font_face.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/font_face.c
rename to contrib/network/netsurf/libcss/src/parse/font_face.c
diff --git a/programs/network/netsurf/libcss/src/parse/font_face.h b/contrib/network/netsurf/libcss/src/parse/font_face.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/font_face.h
rename to contrib/network/netsurf/libcss/src/parse/font_face.h
diff --git a/programs/network/netsurf/libcss/src/parse/important.c b/contrib/network/netsurf/libcss/src/parse/important.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/important.c
rename to contrib/network/netsurf/libcss/src/parse/important.c
diff --git a/programs/network/netsurf/libcss/src/parse/important.h b/contrib/network/netsurf/libcss/src/parse/important.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/important.h
rename to contrib/network/netsurf/libcss/src/parse/important.h
diff --git a/programs/network/netsurf/libcss/src/parse/language.c b/contrib/network/netsurf/libcss/src/parse/language.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/language.c
rename to contrib/network/netsurf/libcss/src/parse/language.c
diff --git a/programs/network/netsurf/libcss/src/parse/language.h b/contrib/network/netsurf/libcss/src/parse/language.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/language.h
rename to contrib/network/netsurf/libcss/src/parse/language.h
diff --git a/programs/network/netsurf/libcss/src/parse/parse.c b/contrib/network/netsurf/libcss/src/parse/parse.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/parse.c
rename to contrib/network/netsurf/libcss/src/parse/parse.c
diff --git a/programs/network/netsurf/libcss/src/parse/parse.h b/contrib/network/netsurf/libcss/src/parse/parse.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/parse.h
rename to contrib/network/netsurf/libcss/src/parse/parse.h
diff --git a/programs/network/netsurf/libcss/src/parse/properties/.gitignore b/contrib/network/netsurf/libcss/src/parse/properties/.gitignore
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/.gitignore
rename to contrib/network/netsurf/libcss/src/parse/properties/.gitignore
diff --git a/programs/network/netsurf/libcss/src/parse/properties/Makefile b/contrib/network/netsurf/libcss/src/parse/properties/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/Makefile
rename to contrib/network/netsurf/libcss/src/parse/properties/Makefile
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_attachment.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_attachment.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_attachment.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_attachment.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_image.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_image.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_image.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_image.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_repeat.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_repeat.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_background_repeat.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_background_repeat.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_bottom_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_collapse.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_collapse.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_collapse.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_collapse.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_left_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_right_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_side_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_border_top_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_bottom.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_bottom.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_bottom.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_break_after.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_break_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_break_after.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_break_after.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_break_before.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_break_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_break_before.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_break_before.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_break_inside.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_break_inside.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_break_inside.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_break_inside.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_caption_side.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_caption_side.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_caption_side.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_caption_side.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_clear.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_clear.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_clear.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_clear.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_count.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_count.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_count.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_count.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_fill.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_fill.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_fill.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_fill.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_gap.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_gap.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_gap.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_gap.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_rule_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_span.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_span.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_span.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_span.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_column_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_column_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_counter_increment.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_counter_increment.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_counter_increment.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_counter_increment.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_counter_reset.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_counter_reset.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_counter_reset.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_counter_reset.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_cue_after.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_cue_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_cue_after.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_cue_after.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_cue_before.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_cue_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_cue_before.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_cue_before.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_direction.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_direction.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_direction.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_direction.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_display.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_display.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_display.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_display.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_empty_cells.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_empty_cells.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_empty_cells.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_empty_cells.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_float.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_float.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_float.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_float.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_font_size.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_font_size.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_font_size.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_font_size.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_font_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_font_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_font_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_font_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_font_variant.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_font_variant.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_font_variant.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_font_variant.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_height.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_height.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_height.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_left.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_left.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_left.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_letter_spacing.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_letter_spacing.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_letter_spacing.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_letter_spacing.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_line_height.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_line_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_line_height.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_line_height.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_image.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_image.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_image.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_image.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_position.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_position.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_position.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_list_style_position.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_bottom.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_bottom.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_bottom.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_left.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_left.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_left.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_right.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_right.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_right.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_side.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_side.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_side.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_side.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_top.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_margin_top.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_margin_top.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_max_height.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_max_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_max_height.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_max_height.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_max_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_max_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_max_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_max_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_min_height.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_min_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_min_height.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_min_height.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_min_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_min_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_min_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_min_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_orphans.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_orphans.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_orphans.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_orphans.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_outline_color.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_outline_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_outline_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_outline_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_outline_style.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_outline_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_outline_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_outline_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_outline_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_outline_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_outline_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_outline_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_overflow.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_overflow.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_overflow.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_overflow.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_bottom.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_bottom.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_bottom.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_left.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_left.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_left.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_right.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_right.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_right.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_side.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_side.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_side.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_side.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_top.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_padding_top.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_padding_top.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_after.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_after.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_after.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_before.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_before.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_before.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_inside.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_inside.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_inside.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_page_break_inside.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_pause_after.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pause_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_pause_after.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pause_after.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_pause_before.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pause_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_pause_before.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pause_before.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_pitch.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pitch.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_pitch.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pitch.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_pitch_range.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pitch_range.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_pitch_range.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_pitch_range.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_position.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_position.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_position.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_position.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_richness.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_richness.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_richness.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_richness.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_right.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_right.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_right.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_side.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_side.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_side.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_side.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak_header.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak_header.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak_header.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak_header.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak_numeral.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak_numeral.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak_numeral.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak_numeral.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak_punctuation.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak_punctuation.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_speak_punctuation.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speak_punctuation.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_speech_rate.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speech_rate.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_speech_rate.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_speech_rate.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_stress.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_stress.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_stress.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_stress.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_table_layout.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_table_layout.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_table_layout.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_table_layout.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_text_align.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_text_align.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_text_align.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_text_align.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_text_indent.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_text_indent.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_text_indent.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_text_indent.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_text_transform.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_text_transform.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_text_transform.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_text_transform.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_top.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_top.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_top.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_unicode_bidi.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_unicode_bidi.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_unicode_bidi.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_unicode_bidi.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_vertical_align.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_vertical_align.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_vertical_align.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_vertical_align.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_visibility.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_visibility.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_visibility.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_visibility.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_volume.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_volume.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_volume.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_volume.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_white_space.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_white_space.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_white_space.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_white_space.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_widows.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_widows.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_widows.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_widows.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_width.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_word_spacing.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_word_spacing.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_word_spacing.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_word_spacing.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/autogenerated_z_index.c b/contrib/network/netsurf/libcss/src/parse/properties/autogenerated_z_index.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/autogenerated_z_index.c
rename to contrib/network/netsurf/libcss/src/parse/properties/autogenerated_z_index.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/azimuth.c b/contrib/network/netsurf/libcss/src/parse/properties/azimuth.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/azimuth.c
rename to contrib/network/netsurf/libcss/src/parse/properties/azimuth.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/background.c b/contrib/network/netsurf/libcss/src/parse/properties/background.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/background.c
rename to contrib/network/netsurf/libcss/src/parse/properties/background.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/background_position.c b/contrib/network/netsurf/libcss/src/parse/properties/background_position.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/background_position.c
rename to contrib/network/netsurf/libcss/src/parse/properties/background_position.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/border.c b/contrib/network/netsurf/libcss/src/parse/properties/border.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/border.c
rename to contrib/network/netsurf/libcss/src/parse/properties/border.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/border_color.c b/contrib/network/netsurf/libcss/src/parse/properties/border_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/border_color.c
rename to contrib/network/netsurf/libcss/src/parse/properties/border_color.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/border_spacing.c b/contrib/network/netsurf/libcss/src/parse/properties/border_spacing.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/border_spacing.c
rename to contrib/network/netsurf/libcss/src/parse/properties/border_spacing.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/border_style.c b/contrib/network/netsurf/libcss/src/parse/properties/border_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/border_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/border_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/border_width.c b/contrib/network/netsurf/libcss/src/parse/properties/border_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/border_width.c
rename to contrib/network/netsurf/libcss/src/parse/properties/border_width.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/clip.c b/contrib/network/netsurf/libcss/src/parse/properties/clip.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/clip.c
rename to contrib/network/netsurf/libcss/src/parse/properties/clip.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/column_rule.c b/contrib/network/netsurf/libcss/src/parse/properties/column_rule.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/column_rule.c
rename to contrib/network/netsurf/libcss/src/parse/properties/column_rule.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/columns.c b/contrib/network/netsurf/libcss/src/parse/properties/columns.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/columns.c
rename to contrib/network/netsurf/libcss/src/parse/properties/columns.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/content.c b/contrib/network/netsurf/libcss/src/parse/properties/content.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/content.c
rename to contrib/network/netsurf/libcss/src/parse/properties/content.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/css_property_parser_gen.c b/contrib/network/netsurf/libcss/src/parse/properties/css_property_parser_gen.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/css_property_parser_gen.c
rename to contrib/network/netsurf/libcss/src/parse/properties/css_property_parser_gen.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/cue.c b/contrib/network/netsurf/libcss/src/parse/properties/cue.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/cue.c
rename to contrib/network/netsurf/libcss/src/parse/properties/cue.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/cursor.c b/contrib/network/netsurf/libcss/src/parse/properties/cursor.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/cursor.c
rename to contrib/network/netsurf/libcss/src/parse/properties/cursor.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/elevation.c b/contrib/network/netsurf/libcss/src/parse/properties/elevation.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/elevation.c
rename to contrib/network/netsurf/libcss/src/parse/properties/elevation.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/file.src b/contrib/network/netsurf/libcss/src/parse/properties/file.src
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/file.src
rename to contrib/network/netsurf/libcss/src/parse/properties/file.src
diff --git a/programs/network/netsurf/libcss/src/parse/properties/font.c b/contrib/network/netsurf/libcss/src/parse/properties/font.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/font.c
rename to contrib/network/netsurf/libcss/src/parse/properties/font.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/font_family.c b/contrib/network/netsurf/libcss/src/parse/properties/font_family.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/font_family.c
rename to contrib/network/netsurf/libcss/src/parse/properties/font_family.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/font_weight.c b/contrib/network/netsurf/libcss/src/parse/properties/font_weight.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/font_weight.c
rename to contrib/network/netsurf/libcss/src/parse/properties/font_weight.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/list_style.c b/contrib/network/netsurf/libcss/src/parse/properties/list_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/list_style.c
rename to contrib/network/netsurf/libcss/src/parse/properties/list_style.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/list_style_type.c b/contrib/network/netsurf/libcss/src/parse/properties/list_style_type.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/list_style_type.c
rename to contrib/network/netsurf/libcss/src/parse/properties/list_style_type.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/margin.c b/contrib/network/netsurf/libcss/src/parse/properties/margin.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/margin.c
rename to contrib/network/netsurf/libcss/src/parse/properties/margin.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/opacity.c b/contrib/network/netsurf/libcss/src/parse/properties/opacity.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/opacity.c
rename to contrib/network/netsurf/libcss/src/parse/properties/opacity.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/outline.c b/contrib/network/netsurf/libcss/src/parse/properties/outline.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/outline.c
rename to contrib/network/netsurf/libcss/src/parse/properties/outline.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/padding.c b/contrib/network/netsurf/libcss/src/parse/properties/padding.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/padding.c
rename to contrib/network/netsurf/libcss/src/parse/properties/padding.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/pause.c b/contrib/network/netsurf/libcss/src/parse/properties/pause.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/pause.c
rename to contrib/network/netsurf/libcss/src/parse/properties/pause.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/play_during.c b/contrib/network/netsurf/libcss/src/parse/properties/play_during.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/play_during.c
rename to contrib/network/netsurf/libcss/src/parse/properties/play_during.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/properties.c b/contrib/network/netsurf/libcss/src/parse/properties/properties.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/properties.c
rename to contrib/network/netsurf/libcss/src/parse/properties/properties.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/properties.gen b/contrib/network/netsurf/libcss/src/parse/properties/properties.gen
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/properties.gen
rename to contrib/network/netsurf/libcss/src/parse/properties/properties.gen
diff --git a/programs/network/netsurf/libcss/src/parse/properties/properties.h b/contrib/network/netsurf/libcss/src/parse/properties/properties.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/properties.h
rename to contrib/network/netsurf/libcss/src/parse/properties/properties.h
diff --git a/programs/network/netsurf/libcss/src/parse/properties/quotes.c b/contrib/network/netsurf/libcss/src/parse/properties/quotes.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/quotes.c
rename to contrib/network/netsurf/libcss/src/parse/properties/quotes.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/text_decoration.c b/contrib/network/netsurf/libcss/src/parse/properties/text_decoration.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/text_decoration.c
rename to contrib/network/netsurf/libcss/src/parse/properties/text_decoration.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/utils.c b/contrib/network/netsurf/libcss/src/parse/properties/utils.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/utils.c
rename to contrib/network/netsurf/libcss/src/parse/properties/utils.c
diff --git a/programs/network/netsurf/libcss/src/parse/properties/utils.h b/contrib/network/netsurf/libcss/src/parse/properties/utils.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/utils.h
rename to contrib/network/netsurf/libcss/src/parse/properties/utils.h
diff --git a/programs/network/netsurf/libcss/src/parse/properties/voice_family.c b/contrib/network/netsurf/libcss/src/parse/properties/voice_family.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/properties/voice_family.c
rename to contrib/network/netsurf/libcss/src/parse/properties/voice_family.c
diff --git a/programs/network/netsurf/libcss/src/parse/propstrings.c b/contrib/network/netsurf/libcss/src/parse/propstrings.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/propstrings.c
rename to contrib/network/netsurf/libcss/src/parse/propstrings.c
diff --git a/programs/network/netsurf/libcss/src/parse/propstrings.h b/contrib/network/netsurf/libcss/src/parse/propstrings.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/parse/propstrings.h
rename to contrib/network/netsurf/libcss/src/parse/propstrings.h
diff --git a/programs/network/netsurf/libcss/src/select/Makefile b/contrib/network/netsurf/libcss/src/select/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/Makefile
rename to contrib/network/netsurf/libcss/src/select/Makefile
diff --git a/programs/network/netsurf/libcss/src/select/computed.c b/contrib/network/netsurf/libcss/src/select/computed.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/computed.c
rename to contrib/network/netsurf/libcss/src/select/computed.c
diff --git a/programs/network/netsurf/libcss/src/select/computed.h b/contrib/network/netsurf/libcss/src/select/computed.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/computed.h
rename to contrib/network/netsurf/libcss/src/select/computed.h
diff --git a/programs/network/netsurf/libcss/src/select/dispatch.c b/contrib/network/netsurf/libcss/src/select/dispatch.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/dispatch.c
rename to contrib/network/netsurf/libcss/src/select/dispatch.c
diff --git a/programs/network/netsurf/libcss/src/select/dispatch.h b/contrib/network/netsurf/libcss/src/select/dispatch.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/dispatch.h
rename to contrib/network/netsurf/libcss/src/select/dispatch.h
diff --git a/programs/network/netsurf/libcss/src/select/font_face.c b/contrib/network/netsurf/libcss/src/select/font_face.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/font_face.c
rename to contrib/network/netsurf/libcss/src/select/font_face.c
diff --git a/programs/network/netsurf/libcss/src/select/font_face.h b/contrib/network/netsurf/libcss/src/select/font_face.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/font_face.h
rename to contrib/network/netsurf/libcss/src/select/font_face.h
diff --git a/programs/network/netsurf/libcss/src/select/hash.c b/contrib/network/netsurf/libcss/src/select/hash.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/hash.c
rename to contrib/network/netsurf/libcss/src/select/hash.c
diff --git a/programs/network/netsurf/libcss/src/select/hash.h b/contrib/network/netsurf/libcss/src/select/hash.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/hash.h
rename to contrib/network/netsurf/libcss/src/select/hash.h
diff --git a/programs/network/netsurf/libcss/src/select/properties/Makefile b/contrib/network/netsurf/libcss/src/select/properties/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/Makefile
rename to contrib/network/netsurf/libcss/src/select/properties/Makefile
diff --git a/programs/network/netsurf/libcss/src/select/properties/azimuth.c b/contrib/network/netsurf/libcss/src/select/properties/azimuth.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/azimuth.c
rename to contrib/network/netsurf/libcss/src/select/properties/azimuth.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/background_attachment.c b/contrib/network/netsurf/libcss/src/select/properties/background_attachment.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/background_attachment.c
rename to contrib/network/netsurf/libcss/src/select/properties/background_attachment.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/background_color.c b/contrib/network/netsurf/libcss/src/select/properties/background_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/background_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/background_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/background_image.c b/contrib/network/netsurf/libcss/src/select/properties/background_image.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/background_image.c
rename to contrib/network/netsurf/libcss/src/select/properties/background_image.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/background_position.c b/contrib/network/netsurf/libcss/src/select/properties/background_position.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/background_position.c
rename to contrib/network/netsurf/libcss/src/select/properties/background_position.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/background_repeat.c b/contrib/network/netsurf/libcss/src/select/properties/background_repeat.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/background_repeat.c
rename to contrib/network/netsurf/libcss/src/select/properties/background_repeat.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_bottom_color.c b/contrib/network/netsurf/libcss/src/select/properties/border_bottom_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_bottom_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_bottom_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_bottom_style.c b/contrib/network/netsurf/libcss/src/select/properties/border_bottom_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_bottom_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_bottom_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_bottom_width.c b/contrib/network/netsurf/libcss/src/select/properties/border_bottom_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_bottom_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_bottom_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_collapse.c b/contrib/network/netsurf/libcss/src/select/properties/border_collapse.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_collapse.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_collapse.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_left_color.c b/contrib/network/netsurf/libcss/src/select/properties/border_left_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_left_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_left_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_left_style.c b/contrib/network/netsurf/libcss/src/select/properties/border_left_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_left_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_left_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_left_width.c b/contrib/network/netsurf/libcss/src/select/properties/border_left_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_left_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_left_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_right_color.c b/contrib/network/netsurf/libcss/src/select/properties/border_right_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_right_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_right_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_right_style.c b/contrib/network/netsurf/libcss/src/select/properties/border_right_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_right_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_right_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_right_width.c b/contrib/network/netsurf/libcss/src/select/properties/border_right_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_right_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_right_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_spacing.c b/contrib/network/netsurf/libcss/src/select/properties/border_spacing.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_spacing.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_spacing.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_top_color.c b/contrib/network/netsurf/libcss/src/select/properties/border_top_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_top_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_top_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_top_style.c b/contrib/network/netsurf/libcss/src/select/properties/border_top_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_top_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_top_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/border_top_width.c b/contrib/network/netsurf/libcss/src/select/properties/border_top_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/border_top_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/border_top_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/bottom.c b/contrib/network/netsurf/libcss/src/select/properties/bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/bottom.c
rename to contrib/network/netsurf/libcss/src/select/properties/bottom.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/break_after.c b/contrib/network/netsurf/libcss/src/select/properties/break_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/break_after.c
rename to contrib/network/netsurf/libcss/src/select/properties/break_after.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/break_before.c b/contrib/network/netsurf/libcss/src/select/properties/break_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/break_before.c
rename to contrib/network/netsurf/libcss/src/select/properties/break_before.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/break_inside.c b/contrib/network/netsurf/libcss/src/select/properties/break_inside.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/break_inside.c
rename to contrib/network/netsurf/libcss/src/select/properties/break_inside.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/caption_side.c b/contrib/network/netsurf/libcss/src/select/properties/caption_side.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/caption_side.c
rename to contrib/network/netsurf/libcss/src/select/properties/caption_side.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/clear.c b/contrib/network/netsurf/libcss/src/select/properties/clear.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/clear.c
rename to contrib/network/netsurf/libcss/src/select/properties/clear.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/clip.c b/contrib/network/netsurf/libcss/src/select/properties/clip.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/clip.c
rename to contrib/network/netsurf/libcss/src/select/properties/clip.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/color.c b/contrib/network/netsurf/libcss/src/select/properties/color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/color.c
rename to contrib/network/netsurf/libcss/src/select/properties/color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_count.c b/contrib/network/netsurf/libcss/src/select/properties/column_count.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_count.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_count.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_fill.c b/contrib/network/netsurf/libcss/src/select/properties/column_fill.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_fill.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_fill.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_gap.c b/contrib/network/netsurf/libcss/src/select/properties/column_gap.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_gap.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_gap.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_rule_color.c b/contrib/network/netsurf/libcss/src/select/properties/column_rule_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_rule_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_rule_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_rule_style.c b/contrib/network/netsurf/libcss/src/select/properties/column_rule_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_rule_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_rule_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_rule_width.c b/contrib/network/netsurf/libcss/src/select/properties/column_rule_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_rule_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_rule_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_span.c b/contrib/network/netsurf/libcss/src/select/properties/column_span.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_span.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_span.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/column_width.c b/contrib/network/netsurf/libcss/src/select/properties/column_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/column_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/column_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/content.c b/contrib/network/netsurf/libcss/src/select/properties/content.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/content.c
rename to contrib/network/netsurf/libcss/src/select/properties/content.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/counter_increment.c b/contrib/network/netsurf/libcss/src/select/properties/counter_increment.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/counter_increment.c
rename to contrib/network/netsurf/libcss/src/select/properties/counter_increment.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/counter_reset.c b/contrib/network/netsurf/libcss/src/select/properties/counter_reset.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/counter_reset.c
rename to contrib/network/netsurf/libcss/src/select/properties/counter_reset.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/cue_after.c b/contrib/network/netsurf/libcss/src/select/properties/cue_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/cue_after.c
rename to contrib/network/netsurf/libcss/src/select/properties/cue_after.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/cue_before.c b/contrib/network/netsurf/libcss/src/select/properties/cue_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/cue_before.c
rename to contrib/network/netsurf/libcss/src/select/properties/cue_before.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/cursor.c b/contrib/network/netsurf/libcss/src/select/properties/cursor.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/cursor.c
rename to contrib/network/netsurf/libcss/src/select/properties/cursor.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/direction.c b/contrib/network/netsurf/libcss/src/select/properties/direction.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/direction.c
rename to contrib/network/netsurf/libcss/src/select/properties/direction.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/display.c b/contrib/network/netsurf/libcss/src/select/properties/display.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/display.c
rename to contrib/network/netsurf/libcss/src/select/properties/display.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/elevation.c b/contrib/network/netsurf/libcss/src/select/properties/elevation.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/elevation.c
rename to contrib/network/netsurf/libcss/src/select/properties/elevation.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/empty_cells.c b/contrib/network/netsurf/libcss/src/select/properties/empty_cells.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/empty_cells.c
rename to contrib/network/netsurf/libcss/src/select/properties/empty_cells.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/float.c b/contrib/network/netsurf/libcss/src/select/properties/float.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/float.c
rename to contrib/network/netsurf/libcss/src/select/properties/float.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/font_family.c b/contrib/network/netsurf/libcss/src/select/properties/font_family.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/font_family.c
rename to contrib/network/netsurf/libcss/src/select/properties/font_family.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/font_size.c b/contrib/network/netsurf/libcss/src/select/properties/font_size.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/font_size.c
rename to contrib/network/netsurf/libcss/src/select/properties/font_size.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/font_style.c b/contrib/network/netsurf/libcss/src/select/properties/font_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/font_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/font_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/font_variant.c b/contrib/network/netsurf/libcss/src/select/properties/font_variant.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/font_variant.c
rename to contrib/network/netsurf/libcss/src/select/properties/font_variant.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/font_weight.c b/contrib/network/netsurf/libcss/src/select/properties/font_weight.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/font_weight.c
rename to contrib/network/netsurf/libcss/src/select/properties/font_weight.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/height.c b/contrib/network/netsurf/libcss/src/select/properties/height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/height.c
rename to contrib/network/netsurf/libcss/src/select/properties/height.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/helpers.c b/contrib/network/netsurf/libcss/src/select/properties/helpers.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/helpers.c
rename to contrib/network/netsurf/libcss/src/select/properties/helpers.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/helpers.h b/contrib/network/netsurf/libcss/src/select/properties/helpers.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/helpers.h
rename to contrib/network/netsurf/libcss/src/select/properties/helpers.h
diff --git a/programs/network/netsurf/libcss/src/select/properties/left.c b/contrib/network/netsurf/libcss/src/select/properties/left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/left.c
rename to contrib/network/netsurf/libcss/src/select/properties/left.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/letter_spacing.c b/contrib/network/netsurf/libcss/src/select/properties/letter_spacing.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/letter_spacing.c
rename to contrib/network/netsurf/libcss/src/select/properties/letter_spacing.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/line_height.c b/contrib/network/netsurf/libcss/src/select/properties/line_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/line_height.c
rename to contrib/network/netsurf/libcss/src/select/properties/line_height.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/list_style_image.c b/contrib/network/netsurf/libcss/src/select/properties/list_style_image.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/list_style_image.c
rename to contrib/network/netsurf/libcss/src/select/properties/list_style_image.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/list_style_position.c b/contrib/network/netsurf/libcss/src/select/properties/list_style_position.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/list_style_position.c
rename to contrib/network/netsurf/libcss/src/select/properties/list_style_position.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/list_style_type.c b/contrib/network/netsurf/libcss/src/select/properties/list_style_type.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/list_style_type.c
rename to contrib/network/netsurf/libcss/src/select/properties/list_style_type.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/margin_bottom.c b/contrib/network/netsurf/libcss/src/select/properties/margin_bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/margin_bottom.c
rename to contrib/network/netsurf/libcss/src/select/properties/margin_bottom.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/margin_left.c b/contrib/network/netsurf/libcss/src/select/properties/margin_left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/margin_left.c
rename to contrib/network/netsurf/libcss/src/select/properties/margin_left.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/margin_right.c b/contrib/network/netsurf/libcss/src/select/properties/margin_right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/margin_right.c
rename to contrib/network/netsurf/libcss/src/select/properties/margin_right.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/margin_top.c b/contrib/network/netsurf/libcss/src/select/properties/margin_top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/margin_top.c
rename to contrib/network/netsurf/libcss/src/select/properties/margin_top.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/max_height.c b/contrib/network/netsurf/libcss/src/select/properties/max_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/max_height.c
rename to contrib/network/netsurf/libcss/src/select/properties/max_height.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/max_width.c b/contrib/network/netsurf/libcss/src/select/properties/max_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/max_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/max_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/min_height.c b/contrib/network/netsurf/libcss/src/select/properties/min_height.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/min_height.c
rename to contrib/network/netsurf/libcss/src/select/properties/min_height.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/min_width.c b/contrib/network/netsurf/libcss/src/select/properties/min_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/min_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/min_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/opacity.c b/contrib/network/netsurf/libcss/src/select/properties/opacity.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/opacity.c
rename to contrib/network/netsurf/libcss/src/select/properties/opacity.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/orphans.c b/contrib/network/netsurf/libcss/src/select/properties/orphans.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/orphans.c
rename to contrib/network/netsurf/libcss/src/select/properties/orphans.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/outline_color.c b/contrib/network/netsurf/libcss/src/select/properties/outline_color.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/outline_color.c
rename to contrib/network/netsurf/libcss/src/select/properties/outline_color.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/outline_style.c b/contrib/network/netsurf/libcss/src/select/properties/outline_style.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/outline_style.c
rename to contrib/network/netsurf/libcss/src/select/properties/outline_style.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/outline_width.c b/contrib/network/netsurf/libcss/src/select/properties/outline_width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/outline_width.c
rename to contrib/network/netsurf/libcss/src/select/properties/outline_width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/overflow.c b/contrib/network/netsurf/libcss/src/select/properties/overflow.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/overflow.c
rename to contrib/network/netsurf/libcss/src/select/properties/overflow.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/padding_bottom.c b/contrib/network/netsurf/libcss/src/select/properties/padding_bottom.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/padding_bottom.c
rename to contrib/network/netsurf/libcss/src/select/properties/padding_bottom.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/padding_left.c b/contrib/network/netsurf/libcss/src/select/properties/padding_left.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/padding_left.c
rename to contrib/network/netsurf/libcss/src/select/properties/padding_left.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/padding_right.c b/contrib/network/netsurf/libcss/src/select/properties/padding_right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/padding_right.c
rename to contrib/network/netsurf/libcss/src/select/properties/padding_right.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/padding_top.c b/contrib/network/netsurf/libcss/src/select/properties/padding_top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/padding_top.c
rename to contrib/network/netsurf/libcss/src/select/properties/padding_top.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/page_break_after.c b/contrib/network/netsurf/libcss/src/select/properties/page_break_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/page_break_after.c
rename to contrib/network/netsurf/libcss/src/select/properties/page_break_after.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/page_break_before.c b/contrib/network/netsurf/libcss/src/select/properties/page_break_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/page_break_before.c
rename to contrib/network/netsurf/libcss/src/select/properties/page_break_before.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/page_break_inside.c b/contrib/network/netsurf/libcss/src/select/properties/page_break_inside.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/page_break_inside.c
rename to contrib/network/netsurf/libcss/src/select/properties/page_break_inside.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/pause_after.c b/contrib/network/netsurf/libcss/src/select/properties/pause_after.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/pause_after.c
rename to contrib/network/netsurf/libcss/src/select/properties/pause_after.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/pause_before.c b/contrib/network/netsurf/libcss/src/select/properties/pause_before.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/pause_before.c
rename to contrib/network/netsurf/libcss/src/select/properties/pause_before.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/pitch.c b/contrib/network/netsurf/libcss/src/select/properties/pitch.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/pitch.c
rename to contrib/network/netsurf/libcss/src/select/properties/pitch.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/pitch_range.c b/contrib/network/netsurf/libcss/src/select/properties/pitch_range.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/pitch_range.c
rename to contrib/network/netsurf/libcss/src/select/properties/pitch_range.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/play_during.c b/contrib/network/netsurf/libcss/src/select/properties/play_during.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/play_during.c
rename to contrib/network/netsurf/libcss/src/select/properties/play_during.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/position.c b/contrib/network/netsurf/libcss/src/select/properties/position.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/position.c
rename to contrib/network/netsurf/libcss/src/select/properties/position.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/properties.h b/contrib/network/netsurf/libcss/src/select/properties/properties.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/properties.h
rename to contrib/network/netsurf/libcss/src/select/properties/properties.h
diff --git a/programs/network/netsurf/libcss/src/select/properties/quotes.c b/contrib/network/netsurf/libcss/src/select/properties/quotes.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/quotes.c
rename to contrib/network/netsurf/libcss/src/select/properties/quotes.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/richness.c b/contrib/network/netsurf/libcss/src/select/properties/richness.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/richness.c
rename to contrib/network/netsurf/libcss/src/select/properties/richness.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/right.c b/contrib/network/netsurf/libcss/src/select/properties/right.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/right.c
rename to contrib/network/netsurf/libcss/src/select/properties/right.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/speak.c b/contrib/network/netsurf/libcss/src/select/properties/speak.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/speak.c
rename to contrib/network/netsurf/libcss/src/select/properties/speak.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/speak_header.c b/contrib/network/netsurf/libcss/src/select/properties/speak_header.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/speak_header.c
rename to contrib/network/netsurf/libcss/src/select/properties/speak_header.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/speak_numeral.c b/contrib/network/netsurf/libcss/src/select/properties/speak_numeral.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/speak_numeral.c
rename to contrib/network/netsurf/libcss/src/select/properties/speak_numeral.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/speak_punctuation.c b/contrib/network/netsurf/libcss/src/select/properties/speak_punctuation.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/speak_punctuation.c
rename to contrib/network/netsurf/libcss/src/select/properties/speak_punctuation.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/speech_rate.c b/contrib/network/netsurf/libcss/src/select/properties/speech_rate.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/speech_rate.c
rename to contrib/network/netsurf/libcss/src/select/properties/speech_rate.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/stress.c b/contrib/network/netsurf/libcss/src/select/properties/stress.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/stress.c
rename to contrib/network/netsurf/libcss/src/select/properties/stress.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/table_layout.c b/contrib/network/netsurf/libcss/src/select/properties/table_layout.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/table_layout.c
rename to contrib/network/netsurf/libcss/src/select/properties/table_layout.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/text_align.c b/contrib/network/netsurf/libcss/src/select/properties/text_align.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/text_align.c
rename to contrib/network/netsurf/libcss/src/select/properties/text_align.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/text_decoration.c b/contrib/network/netsurf/libcss/src/select/properties/text_decoration.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/text_decoration.c
rename to contrib/network/netsurf/libcss/src/select/properties/text_decoration.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/text_indent.c b/contrib/network/netsurf/libcss/src/select/properties/text_indent.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/text_indent.c
rename to contrib/network/netsurf/libcss/src/select/properties/text_indent.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/text_transform.c b/contrib/network/netsurf/libcss/src/select/properties/text_transform.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/text_transform.c
rename to contrib/network/netsurf/libcss/src/select/properties/text_transform.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/top.c b/contrib/network/netsurf/libcss/src/select/properties/top.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/top.c
rename to contrib/network/netsurf/libcss/src/select/properties/top.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/unicode_bidi.c b/contrib/network/netsurf/libcss/src/select/properties/unicode_bidi.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/unicode_bidi.c
rename to contrib/network/netsurf/libcss/src/select/properties/unicode_bidi.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/vertical_align.c b/contrib/network/netsurf/libcss/src/select/properties/vertical_align.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/vertical_align.c
rename to contrib/network/netsurf/libcss/src/select/properties/vertical_align.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/visibility.c b/contrib/network/netsurf/libcss/src/select/properties/visibility.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/visibility.c
rename to contrib/network/netsurf/libcss/src/select/properties/visibility.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/voice_family.c b/contrib/network/netsurf/libcss/src/select/properties/voice_family.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/voice_family.c
rename to contrib/network/netsurf/libcss/src/select/properties/voice_family.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/volume.c b/contrib/network/netsurf/libcss/src/select/properties/volume.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/volume.c
rename to contrib/network/netsurf/libcss/src/select/properties/volume.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/white_space.c b/contrib/network/netsurf/libcss/src/select/properties/white_space.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/white_space.c
rename to contrib/network/netsurf/libcss/src/select/properties/white_space.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/width.c b/contrib/network/netsurf/libcss/src/select/properties/width.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/width.c
rename to contrib/network/netsurf/libcss/src/select/properties/width.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/windows.c b/contrib/network/netsurf/libcss/src/select/properties/windows.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/windows.c
rename to contrib/network/netsurf/libcss/src/select/properties/windows.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/word_spacing.c b/contrib/network/netsurf/libcss/src/select/properties/word_spacing.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/word_spacing.c
rename to contrib/network/netsurf/libcss/src/select/properties/word_spacing.c
diff --git a/programs/network/netsurf/libcss/src/select/properties/z_index.c b/contrib/network/netsurf/libcss/src/select/properties/z_index.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/properties/z_index.c
rename to contrib/network/netsurf/libcss/src/select/properties/z_index.c
diff --git a/programs/network/netsurf/libcss/src/select/propget.h b/contrib/network/netsurf/libcss/src/select/propget.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/propget.h
rename to contrib/network/netsurf/libcss/src/select/propget.h
diff --git a/programs/network/netsurf/libcss/src/select/propset.h b/contrib/network/netsurf/libcss/src/select/propset.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/propset.h
rename to contrib/network/netsurf/libcss/src/select/propset.h
diff --git a/programs/network/netsurf/libcss/src/select/select.c b/contrib/network/netsurf/libcss/src/select/select.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/select.c
rename to contrib/network/netsurf/libcss/src/select/select.c
diff --git a/programs/network/netsurf/libcss/src/select/select.h b/contrib/network/netsurf/libcss/src/select/select.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/select/select.h
rename to contrib/network/netsurf/libcss/src/select/select.h
diff --git a/programs/network/netsurf/libcss/src/stylesheet.c b/contrib/network/netsurf/libcss/src/stylesheet.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/stylesheet.c
rename to contrib/network/netsurf/libcss/src/stylesheet.c
diff --git a/programs/network/netsurf/libcss/src/stylesheet.h b/contrib/network/netsurf/libcss/src/stylesheet.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/stylesheet.h
rename to contrib/network/netsurf/libcss/src/stylesheet.h
diff --git a/programs/network/netsurf/libcss/src/utils/Makefile b/contrib/network/netsurf/libcss/src/utils/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/src/utils/Makefile
rename to contrib/network/netsurf/libcss/src/utils/Makefile
diff --git a/programs/network/netsurf/libcss/src/utils/errors.c b/contrib/network/netsurf/libcss/src/utils/errors.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/utils/errors.c
rename to contrib/network/netsurf/libcss/src/utils/errors.c
diff --git a/programs/network/netsurf/libcss/src/utils/parserutilserror.h b/contrib/network/netsurf/libcss/src/utils/parserutilserror.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/utils/parserutilserror.h
rename to contrib/network/netsurf/libcss/src/utils/parserutilserror.h
diff --git a/programs/network/netsurf/libcss/src/utils/utils.c b/contrib/network/netsurf/libcss/src/utils/utils.c
similarity index 100%
rename from programs/network/netsurf/libcss/src/utils/utils.c
rename to contrib/network/netsurf/libcss/src/utils/utils.c
diff --git a/programs/network/netsurf/libcss/src/utils/utils.h b/contrib/network/netsurf/libcss/src/utils/utils.h
similarity index 100%
rename from programs/network/netsurf/libcss/src/utils/utils.h
rename to contrib/network/netsurf/libcss/src/utils/utils.h
diff --git a/programs/network/netsurf/libcss/test/INDEX b/contrib/network/netsurf/libcss/test/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/INDEX
rename to contrib/network/netsurf/libcss/test/INDEX
diff --git a/programs/network/netsurf/libcss/test/Makefile b/contrib/network/netsurf/libcss/test/Makefile
similarity index 100%
rename from programs/network/netsurf/libcss/test/Makefile
rename to contrib/network/netsurf/libcss/test/Makefile
diff --git a/programs/network/netsurf/libcss/test/README b/contrib/network/netsurf/libcss/test/README
similarity index 100%
rename from programs/network/netsurf/libcss/test/README
rename to contrib/network/netsurf/libcss/test/README
diff --git a/programs/network/netsurf/libcss/test/csdetect.c b/contrib/network/netsurf/libcss/test/csdetect.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/csdetect.c
rename to contrib/network/netsurf/libcss/test/csdetect.c
diff --git a/programs/network/netsurf/libcss/test/css21.c b/contrib/network/netsurf/libcss/test/css21.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/css21.c
rename to contrib/network/netsurf/libcss/test/css21.c
diff --git a/programs/network/netsurf/libcss/test/data/csdetect/INDEX b/contrib/network/netsurf/libcss/test/data/csdetect/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/csdetect/INDEX
rename to contrib/network/netsurf/libcss/test/data/csdetect/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/csdetect/bom-charset.dat b/contrib/network/netsurf/libcss/test/data/csdetect/bom-charset.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/csdetect/bom-charset.dat
rename to contrib/network/netsurf/libcss/test/data/csdetect/bom-charset.dat
diff --git a/programs/network/netsurf/libcss/test/data/csdetect/bom.dat b/contrib/network/netsurf/libcss/test/data/csdetect/bom.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/csdetect/bom.dat
rename to contrib/network/netsurf/libcss/test/data/csdetect/bom.dat
diff --git a/programs/network/netsurf/libcss/test/data/css/INDEX b/contrib/network/netsurf/libcss/test/data/css/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/INDEX
rename to contrib/network/netsurf/libcss/test/data/css/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/css/allzengarden.css b/contrib/network/netsurf/libcss/test/data/css/allzengarden.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/allzengarden.css
rename to contrib/network/netsurf/libcss/test/data/css/allzengarden.css
diff --git a/programs/network/netsurf/libcss/test/data/css/badcomment.css b/contrib/network/netsurf/libcss/test/data/css/badcomment.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/badcomment.css
rename to contrib/network/netsurf/libcss/test/data/css/badcomment.css
diff --git a/programs/network/netsurf/libcss/test/data/css/blocks.css b/contrib/network/netsurf/libcss/test/data/css/blocks.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/blocks.css
rename to contrib/network/netsurf/libcss/test/data/css/blocks.css
diff --git a/programs/network/netsurf/libcss/test/data/css/color.css b/contrib/network/netsurf/libcss/test/data/css/color.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/color.css
rename to contrib/network/netsurf/libcss/test/data/css/color.css
diff --git a/programs/network/netsurf/libcss/test/data/css/fontface.css b/contrib/network/netsurf/libcss/test/data/css/fontface.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/fontface.css
rename to contrib/network/netsurf/libcss/test/data/css/fontface.css
diff --git a/programs/network/netsurf/libcss/test/data/css/malformed.css b/contrib/network/netsurf/libcss/test/data/css/malformed.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/malformed.css
rename to contrib/network/netsurf/libcss/test/data/css/malformed.css
diff --git a/programs/network/netsurf/libcss/test/data/css/simple.css b/contrib/network/netsurf/libcss/test/data/css/simple.css
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/css/simple.css
rename to contrib/network/netsurf/libcss/test/data/css/simple.css
diff --git a/programs/network/netsurf/libcss/test/data/lex/INDEX b/contrib/network/netsurf/libcss/test/data/lex/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/lex/INDEX
rename to contrib/network/netsurf/libcss/test/data/lex/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/lex/regression.dat b/contrib/network/netsurf/libcss/test/data/lex/regression.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/lex/regression.dat
rename to contrib/network/netsurf/libcss/test/data/lex/regression.dat
diff --git a/programs/network/netsurf/libcss/test/data/lex/tests1.dat b/contrib/network/netsurf/libcss/test/data/lex/tests1.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/lex/tests1.dat
rename to contrib/network/netsurf/libcss/test/data/lex/tests1.dat
diff --git a/programs/network/netsurf/libcss/test/data/lex/tests2.dat b/contrib/network/netsurf/libcss/test/data/lex/tests2.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/lex/tests2.dat
rename to contrib/network/netsurf/libcss/test/data/lex/tests2.dat
diff --git a/programs/network/netsurf/libcss/test/data/number/INDEX b/contrib/network/netsurf/libcss/test/data/number/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/number/INDEX
rename to contrib/network/netsurf/libcss/test/data/number/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/number/number.dat b/contrib/network/netsurf/libcss/test/data/number/number.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/number/number.dat
rename to contrib/network/netsurf/libcss/test/data/number/number.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/INDEX b/contrib/network/netsurf/libcss/test/data/parse/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/INDEX
rename to contrib/network/netsurf/libcss/test/data/parse/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/parse/README b/contrib/network/netsurf/libcss/test/data/parse/README
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/README
rename to contrib/network/netsurf/libcss/test/data/parse/README
diff --git a/programs/network/netsurf/libcss/test/data/parse/atrules.dat b/contrib/network/netsurf/libcss/test/data/parse/atrules.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/atrules.dat
rename to contrib/network/netsurf/libcss/test/data/parse/atrules.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/colours-hsl.dat b/contrib/network/netsurf/libcss/test/data/parse/colours-hsl.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/colours-hsl.dat
rename to contrib/network/netsurf/libcss/test/data/parse/colours-hsl.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/colours.dat b/contrib/network/netsurf/libcss/test/data/parse/colours.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/colours.dat
rename to contrib/network/netsurf/libcss/test/data/parse/colours.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/makefixed.pl b/contrib/network/netsurf/libcss/test/data/parse/makefixed.pl
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/makefixed.pl
rename to contrib/network/netsurf/libcss/test/data/parse/makefixed.pl
diff --git a/programs/network/netsurf/libcss/test/data/parse/makeopv.pl b/contrib/network/netsurf/libcss/test/data/parse/makeopv.pl
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/makeopv.pl
rename to contrib/network/netsurf/libcss/test/data/parse/makeopv.pl
diff --git a/programs/network/netsurf/libcss/test/data/parse/nth.dat b/contrib/network/netsurf/libcss/test/data/parse/nth.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/nth.dat
rename to contrib/network/netsurf/libcss/test/data/parse/nth.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/properties.dat b/contrib/network/netsurf/libcss/test/data/parse/properties.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/properties.dat
rename to contrib/network/netsurf/libcss/test/data/parse/properties.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/selectors.dat b/contrib/network/netsurf/libcss/test/data/parse/selectors.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/selectors.dat
rename to contrib/network/netsurf/libcss/test/data/parse/selectors.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse/tests1.dat b/contrib/network/netsurf/libcss/test/data/parse/tests1.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse/tests1.dat
rename to contrib/network/netsurf/libcss/test/data/parse/tests1.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/INDEX b/contrib/network/netsurf/libcss/test/data/parse2/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/INDEX
rename to contrib/network/netsurf/libcss/test/data/parse2/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/parse2/README b/contrib/network/netsurf/libcss/test/data/parse2/README
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/README
rename to contrib/network/netsurf/libcss/test/data/parse2/README
diff --git a/programs/network/netsurf/libcss/test/data/parse2/au.dat b/contrib/network/netsurf/libcss/test/data/parse2/au.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/au.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/au.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/bg.dat b/contrib/network/netsurf/libcss/test/data/parse2/bg.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/bg.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/bg.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/bgpos.dat b/contrib/network/netsurf/libcss/test/data/parse2/bgpos.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/bgpos.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/bgpos.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/border.dat b/contrib/network/netsurf/libcss/test/data/parse2/border.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/border.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/border.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/comments.dat b/contrib/network/netsurf/libcss/test/data/parse2/comments.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/comments.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/comments.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/eof.dat b/contrib/network/netsurf/libcss/test/data/parse2/eof.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/eof.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/eof.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/font.dat b/contrib/network/netsurf/libcss/test/data/parse2/font.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/font.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/font.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/illegal-values.dat b/contrib/network/netsurf/libcss/test/data/parse2/illegal-values.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/illegal-values.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/illegal-values.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/list.dat b/contrib/network/netsurf/libcss/test/data/parse2/list.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/list.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/list.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/malformed-declarations.dat b/contrib/network/netsurf/libcss/test/data/parse2/malformed-declarations.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/malformed-declarations.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/malformed-declarations.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/margin.dat b/contrib/network/netsurf/libcss/test/data/parse2/margin.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/margin.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/margin.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/multicol.dat b/contrib/network/netsurf/libcss/test/data/parse2/multicol.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/multicol.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/multicol.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/outline.dat b/contrib/network/netsurf/libcss/test/data/parse2/outline.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/outline.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/outline.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/padding.dat b/contrib/network/netsurf/libcss/test/data/parse2/padding.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/padding.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/padding.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/selectors.dat b/contrib/network/netsurf/libcss/test/data/parse2/selectors.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/selectors.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/selectors.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/tests1.dat b/contrib/network/netsurf/libcss/test/data/parse2/tests1.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/tests1.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/tests1.dat
diff --git a/programs/network/netsurf/libcss/test/data/parse2/unknown-properties.dat b/contrib/network/netsurf/libcss/test/data/parse2/unknown-properties.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/parse2/unknown-properties.dat
rename to contrib/network/netsurf/libcss/test/data/parse2/unknown-properties.dat
diff --git a/programs/network/netsurf/libcss/test/data/select/INDEX b/contrib/network/netsurf/libcss/test/data/select/INDEX
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/select/INDEX
rename to contrib/network/netsurf/libcss/test/data/select/INDEX
diff --git a/programs/network/netsurf/libcss/test/data/select/tests1.dat b/contrib/network/netsurf/libcss/test/data/select/tests1.dat
similarity index 100%
rename from programs/network/netsurf/libcss/test/data/select/tests1.dat
rename to contrib/network/netsurf/libcss/test/data/select/tests1.dat
diff --git a/programs/network/netsurf/libcss/test/dump.h b/contrib/network/netsurf/libcss/test/dump.h
similarity index 100%
rename from programs/network/netsurf/libcss/test/dump.h
rename to contrib/network/netsurf/libcss/test/dump.h
diff --git a/programs/network/netsurf/libcss/test/dump_computed.h b/contrib/network/netsurf/libcss/test/dump_computed.h
similarity index 100%
rename from programs/network/netsurf/libcss/test/dump_computed.h
rename to contrib/network/netsurf/libcss/test/dump_computed.h
diff --git a/programs/network/netsurf/libcss/test/lex-auto.c b/contrib/network/netsurf/libcss/test/lex-auto.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/lex-auto.c
rename to contrib/network/netsurf/libcss/test/lex-auto.c
diff --git a/programs/network/netsurf/libcss/test/lex.c b/contrib/network/netsurf/libcss/test/lex.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/lex.c
rename to contrib/network/netsurf/libcss/test/lex.c
diff --git a/programs/network/netsurf/libcss/test/number.c b/contrib/network/netsurf/libcss/test/number.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/number.c
rename to contrib/network/netsurf/libcss/test/number.c
diff --git a/programs/network/netsurf/libcss/test/parse-auto.c b/contrib/network/netsurf/libcss/test/parse-auto.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/parse-auto.c
rename to contrib/network/netsurf/libcss/test/parse-auto.c
diff --git a/programs/network/netsurf/libcss/test/parse.c b/contrib/network/netsurf/libcss/test/parse.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/parse.c
rename to contrib/network/netsurf/libcss/test/parse.c
diff --git a/programs/network/netsurf/libcss/test/parse2-auto.c b/contrib/network/netsurf/libcss/test/parse2-auto.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/parse2-auto.c
rename to contrib/network/netsurf/libcss/test/parse2-auto.c
diff --git a/programs/network/netsurf/libcss/test/select-auto.c b/contrib/network/netsurf/libcss/test/select-auto.c
similarity index 100%
rename from programs/network/netsurf/libcss/test/select-auto.c
rename to contrib/network/netsurf/libcss/test/select-auto.c
diff --git a/programs/network/netsurf/libcss/test/testutils.h b/contrib/network/netsurf/libcss/test/testutils.h
similarity index 100%
rename from programs/network/netsurf/libcss/test/testutils.h
rename to contrib/network/netsurf/libcss/test/testutils.h
diff --git a/programs/network/netsurf/libdom/.gitignore b/contrib/network/netsurf/libdom/.gitignore
similarity index 100%
rename from programs/network/netsurf/libdom/.gitignore
rename to contrib/network/netsurf/libdom/.gitignore
diff --git a/programs/network/netsurf/libdom/COPYING b/contrib/network/netsurf/libdom/COPYING
similarity index 100%
rename from programs/network/netsurf/libdom/COPYING
rename to contrib/network/netsurf/libdom/COPYING
diff --git a/programs/network/netsurf/libdom/Makefile b/contrib/network/netsurf/libdom/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/Makefile
rename to contrib/network/netsurf/libdom/Makefile
diff --git a/programs/network/netsurf/libdom/Makefile.config b/contrib/network/netsurf/libdom/Makefile.config
similarity index 100%
rename from programs/network/netsurf/libdom/Makefile.config
rename to contrib/network/netsurf/libdom/Makefile.config
diff --git a/programs/network/netsurf/libdom/README b/contrib/network/netsurf/libdom/README
similarity index 100%
rename from programs/network/netsurf/libdom/README
rename to contrib/network/netsurf/libdom/README
diff --git a/programs/network/netsurf/libdom/bindings/Makefile b/contrib/network/netsurf/libdom/bindings/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/Makefile
rename to contrib/network/netsurf/libdom/bindings/Makefile
diff --git a/programs/network/netsurf/libdom/bindings/hubbub/Makefile b/contrib/network/netsurf/libdom/bindings/hubbub/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/hubbub/Makefile
rename to contrib/network/netsurf/libdom/bindings/hubbub/Makefile
diff --git a/programs/network/netsurf/libdom/bindings/hubbub/README b/contrib/network/netsurf/libdom/bindings/hubbub/README
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/hubbub/README
rename to contrib/network/netsurf/libdom/bindings/hubbub/README
diff --git a/programs/network/netsurf/libdom/bindings/hubbub/errors.h b/contrib/network/netsurf/libdom/bindings/hubbub/errors.h
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/hubbub/errors.h
rename to contrib/network/netsurf/libdom/bindings/hubbub/errors.h
diff --git a/programs/network/netsurf/libdom/bindings/hubbub/parser.c b/contrib/network/netsurf/libdom/bindings/hubbub/parser.c
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/hubbub/parser.c
rename to contrib/network/netsurf/libdom/bindings/hubbub/parser.c
diff --git a/programs/network/netsurf/libdom/bindings/hubbub/parser.h b/contrib/network/netsurf/libdom/bindings/hubbub/parser.h
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/hubbub/parser.h
rename to contrib/network/netsurf/libdom/bindings/hubbub/parser.h
diff --git a/programs/network/netsurf/libdom/bindings/hubbub/utils.h b/contrib/network/netsurf/libdom/bindings/hubbub/utils.h
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/hubbub/utils.h
rename to contrib/network/netsurf/libdom/bindings/hubbub/utils.h
diff --git a/programs/network/netsurf/libdom/bindings/xml/Makefile b/contrib/network/netsurf/libdom/bindings/xml/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/Makefile
rename to contrib/network/netsurf/libdom/bindings/xml/Makefile
diff --git a/programs/network/netsurf/libdom/bindings/xml/README b/contrib/network/netsurf/libdom/bindings/xml/README
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/README
rename to contrib/network/netsurf/libdom/bindings/xml/README
diff --git a/programs/network/netsurf/libdom/bindings/xml/expat_xmlparser.c b/contrib/network/netsurf/libdom/bindings/xml/expat_xmlparser.c
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/expat_xmlparser.c
rename to contrib/network/netsurf/libdom/bindings/xml/expat_xmlparser.c
diff --git a/programs/network/netsurf/libdom/bindings/xml/libxml_xmlparser.c b/contrib/network/netsurf/libdom/bindings/xml/libxml_xmlparser.c
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/libxml_xmlparser.c
rename to contrib/network/netsurf/libdom/bindings/xml/libxml_xmlparser.c
diff --git a/programs/network/netsurf/libdom/bindings/xml/utils.h b/contrib/network/netsurf/libdom/bindings/xml/utils.h
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/utils.h
rename to contrib/network/netsurf/libdom/bindings/xml/utils.h
diff --git a/programs/network/netsurf/libdom/bindings/xml/xmlerror.h b/contrib/network/netsurf/libdom/bindings/xml/xmlerror.h
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/xmlerror.h
rename to contrib/network/netsurf/libdom/bindings/xml/xmlerror.h
diff --git a/programs/network/netsurf/libdom/bindings/xml/xmlparser.h b/contrib/network/netsurf/libdom/bindings/xml/xmlparser.h
similarity index 100%
rename from programs/network/netsurf/libdom/bindings/xml/xmlparser.h
rename to contrib/network/netsurf/libdom/bindings/xml/xmlparser.h
diff --git a/programs/network/netsurf/libdom/docs/RefCnt b/contrib/network/netsurf/libdom/docs/RefCnt
similarity index 100%
rename from programs/network/netsurf/libdom/docs/RefCnt
rename to contrib/network/netsurf/libdom/docs/RefCnt
diff --git a/programs/network/netsurf/libdom/docs/TestSuite b/contrib/network/netsurf/libdom/docs/TestSuite
similarity index 100%
rename from programs/network/netsurf/libdom/docs/TestSuite
rename to contrib/network/netsurf/libdom/docs/TestSuite
diff --git a/programs/network/netsurf/libdom/docs/Todo b/contrib/network/netsurf/libdom/docs/Todo
similarity index 100%
rename from programs/network/netsurf/libdom/docs/Todo
rename to contrib/network/netsurf/libdom/docs/Todo
diff --git a/programs/network/netsurf/libdom/examples/dom-structure-dump.c b/contrib/network/netsurf/libdom/examples/dom-structure-dump.c
similarity index 100%
rename from programs/network/netsurf/libdom/examples/dom-structure-dump.c
rename to contrib/network/netsurf/libdom/examples/dom-structure-dump.c
diff --git a/programs/network/netsurf/libdom/examples/files/test.html b/contrib/network/netsurf/libdom/examples/files/test.html
similarity index 100%
rename from programs/network/netsurf/libdom/examples/files/test.html
rename to contrib/network/netsurf/libdom/examples/files/test.html
diff --git a/programs/network/netsurf/libdom/examples/makefile b/contrib/network/netsurf/libdom/examples/makefile
similarity index 100%
rename from programs/network/netsurf/libdom/examples/makefile
rename to contrib/network/netsurf/libdom/examples/makefile
diff --git a/programs/network/netsurf/libdom/gdb/libdom.py b/contrib/network/netsurf/libdom/gdb/libdom.py
similarity index 100%
rename from programs/network/netsurf/libdom/gdb/libdom.py
rename to contrib/network/netsurf/libdom/gdb/libdom.py
diff --git a/programs/network/netsurf/libdom/include/dom/core/attr.h b/contrib/network/netsurf/libdom/include/dom/core/attr.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/attr.h
rename to contrib/network/netsurf/libdom/include/dom/core/attr.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/cdatasection.h b/contrib/network/netsurf/libdom/include/dom/core/cdatasection.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/cdatasection.h
rename to contrib/network/netsurf/libdom/include/dom/core/cdatasection.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/characterdata.h b/contrib/network/netsurf/libdom/include/dom/core/characterdata.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/characterdata.h
rename to contrib/network/netsurf/libdom/include/dom/core/characterdata.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/comment.h b/contrib/network/netsurf/libdom/include/dom/core/comment.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/comment.h
rename to contrib/network/netsurf/libdom/include/dom/core/comment.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/doc_fragment.h b/contrib/network/netsurf/libdom/include/dom/core/doc_fragment.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/doc_fragment.h
rename to contrib/network/netsurf/libdom/include/dom/core/doc_fragment.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/document.h b/contrib/network/netsurf/libdom/include/dom/core/document.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/document.h
rename to contrib/network/netsurf/libdom/include/dom/core/document.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/document_type.h b/contrib/network/netsurf/libdom/include/dom/core/document_type.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/document_type.h
rename to contrib/network/netsurf/libdom/include/dom/core/document_type.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/element.h b/contrib/network/netsurf/libdom/include/dom/core/element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/element.h
rename to contrib/network/netsurf/libdom/include/dom/core/element.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/entity_ref.h b/contrib/network/netsurf/libdom/include/dom/core/entity_ref.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/entity_ref.h
rename to contrib/network/netsurf/libdom/include/dom/core/entity_ref.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/exceptions.h b/contrib/network/netsurf/libdom/include/dom/core/exceptions.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/exceptions.h
rename to contrib/network/netsurf/libdom/include/dom/core/exceptions.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/implementation.h b/contrib/network/netsurf/libdom/include/dom/core/implementation.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/implementation.h
rename to contrib/network/netsurf/libdom/include/dom/core/implementation.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/namednodemap.h b/contrib/network/netsurf/libdom/include/dom/core/namednodemap.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/namednodemap.h
rename to contrib/network/netsurf/libdom/include/dom/core/namednodemap.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/node.h b/contrib/network/netsurf/libdom/include/dom/core/node.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/node.h
rename to contrib/network/netsurf/libdom/include/dom/core/node.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/nodelist.h b/contrib/network/netsurf/libdom/include/dom/core/nodelist.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/nodelist.h
rename to contrib/network/netsurf/libdom/include/dom/core/nodelist.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/pi.h b/contrib/network/netsurf/libdom/include/dom/core/pi.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/pi.h
rename to contrib/network/netsurf/libdom/include/dom/core/pi.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/string.h b/contrib/network/netsurf/libdom/include/dom/core/string.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/string.h
rename to contrib/network/netsurf/libdom/include/dom/core/string.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/text.h b/contrib/network/netsurf/libdom/include/dom/core/text.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/text.h
rename to contrib/network/netsurf/libdom/include/dom/core/text.h
diff --git a/programs/network/netsurf/libdom/include/dom/core/typeinfo.h b/contrib/network/netsurf/libdom/include/dom/core/typeinfo.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/core/typeinfo.h
rename to contrib/network/netsurf/libdom/include/dom/core/typeinfo.h
diff --git a/programs/network/netsurf/libdom/include/dom/dom.h b/contrib/network/netsurf/libdom/include/dom/dom.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/dom.h
rename to contrib/network/netsurf/libdom/include/dom/dom.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/custom_event.h b/contrib/network/netsurf/libdom/include/dom/events/custom_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/custom_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/custom_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/document_event.h b/contrib/network/netsurf/libdom/include/dom/events/document_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/document_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/document_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/event.h b/contrib/network/netsurf/libdom/include/dom/events/event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/event.h
rename to contrib/network/netsurf/libdom/include/dom/events/event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/event_listener.h b/contrib/network/netsurf/libdom/include/dom/events/event_listener.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/event_listener.h
rename to contrib/network/netsurf/libdom/include/dom/events/event_listener.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/event_target.h b/contrib/network/netsurf/libdom/include/dom/events/event_target.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/event_target.h
rename to contrib/network/netsurf/libdom/include/dom/events/event_target.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/events.h b/contrib/network/netsurf/libdom/include/dom/events/events.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/events.h
rename to contrib/network/netsurf/libdom/include/dom/events/events.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/keyboard_event.h b/contrib/network/netsurf/libdom/include/dom/events/keyboard_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/keyboard_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/keyboard_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/mouse_event.h b/contrib/network/netsurf/libdom/include/dom/events/mouse_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/mouse_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/mouse_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/mouse_multi_wheel_event.h b/contrib/network/netsurf/libdom/include/dom/events/mouse_multi_wheel_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/mouse_multi_wheel_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/mouse_multi_wheel_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/mouse_wheel_event.h b/contrib/network/netsurf/libdom/include/dom/events/mouse_wheel_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/mouse_wheel_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/mouse_wheel_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/mutation_event.h b/contrib/network/netsurf/libdom/include/dom/events/mutation_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/mutation_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/mutation_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/mutation_name_event.h b/contrib/network/netsurf/libdom/include/dom/events/mutation_name_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/mutation_name_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/mutation_name_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/text_event.h b/contrib/network/netsurf/libdom/include/dom/events/text_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/text_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/text_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/events/ui_event.h b/contrib/network/netsurf/libdom/include/dom/events/ui_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/events/ui_event.h
rename to contrib/network/netsurf/libdom/include/dom/events/ui_event.h
diff --git a/programs/network/netsurf/libdom/include/dom/functypes.h b/contrib/network/netsurf/libdom/include/dom/functypes.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/functypes.h
rename to contrib/network/netsurf/libdom/include/dom/functypes.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_anchor_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_anchor_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_anchor_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_anchor_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_applet_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_applet_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_applet_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_applet_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_area_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_area_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_area_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_area_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_base_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_base_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_base_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_base_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_basefont_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_basefont_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_basefont_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_basefont_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_body_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_body_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_body_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_body_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_br_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_br_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_br_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_br_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_button_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_button_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_button_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_button_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_collection.h b/contrib/network/netsurf/libdom/include/dom/html/html_collection.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_collection.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_collection.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_directory_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_directory_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_directory_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_directory_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_div_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_div_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_div_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_div_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_dlist_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_dlist_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_dlist_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_dlist_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_document.h b/contrib/network/netsurf/libdom/include/dom/html/html_document.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_document.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_document.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_fieldset_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_fieldset_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_fieldset_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_fieldset_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_font_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_font_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_font_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_font_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_form_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_form_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_form_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_form_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_frame_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_frame_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_frame_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_frame_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_frameset_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_frameset_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_frameset_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_frameset_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_head_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_head_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_head_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_head_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_heading_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_heading_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_heading_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_heading_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_hr_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_hr_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_hr_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_hr_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_html_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_html_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_html_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_html_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_iframe_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_iframe_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_iframe_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_iframe_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_image_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_image_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_image_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_image_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_input_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_input_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_input_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_input_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_isindex_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_isindex_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_isindex_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_isindex_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_label_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_label_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_label_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_label_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_legend_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_legend_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_legend_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_legend_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_li_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_li_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_li_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_li_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_link_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_link_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_link_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_link_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_map_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_map_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_map_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_map_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_menu_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_menu_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_menu_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_menu_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_meta_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_meta_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_meta_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_meta_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_mod_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_mod_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_mod_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_mod_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_object_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_object_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_object_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_object_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_olist_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_olist_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_olist_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_olist_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_opt_group_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_opt_group_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_opt_group_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_opt_group_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_option_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_option_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_option_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_option_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_options_collection.h b/contrib/network/netsurf/libdom/include/dom/html/html_options_collection.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_options_collection.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_options_collection.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_paragraph_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_paragraph_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_paragraph_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_paragraph_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_param_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_param_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_param_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_param_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_pre_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_pre_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_pre_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_pre_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_quote_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_quote_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_quote_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_quote_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_script_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_script_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_script_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_script_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_select_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_select_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_select_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_select_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_style_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_style_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_style_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_style_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_table_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_table_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_table_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_table_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_tablecaption_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_tablecaption_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_tablecaption_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_tablecaption_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_tablecell_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_tablecell_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_tablecell_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_tablecell_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_tablecol_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_tablecol_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_tablecol_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_tablecol_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_tablerow_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_tablerow_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_tablerow_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_tablerow_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_tablesection_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_tablesection_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_tablesection_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_tablesection_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_text_area_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_text_area_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_text_area_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_text_area_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_title_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_title_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_title_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_title_element.h
diff --git a/programs/network/netsurf/libdom/include/dom/html/html_ulist_element.h b/contrib/network/netsurf/libdom/include/dom/html/html_ulist_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/include/dom/html/html_ulist_element.h
rename to contrib/network/netsurf/libdom/include/dom/html/html_ulist_element.h
diff --git a/programs/network/netsurf/libdom/libdom.pc.in b/contrib/network/netsurf/libdom/libdom.pc.in
similarity index 100%
rename from programs/network/netsurf/libdom/libdom.pc.in
rename to contrib/network/netsurf/libdom/libdom.pc.in
diff --git a/programs/network/netsurf/libdom/src/Makefile b/contrib/network/netsurf/libdom/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/src/Makefile
rename to contrib/network/netsurf/libdom/src/Makefile
diff --git a/programs/network/netsurf/libdom/src/core/Makefile b/contrib/network/netsurf/libdom/src/core/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/Makefile
rename to contrib/network/netsurf/libdom/src/core/Makefile
diff --git a/programs/network/netsurf/libdom/src/core/attr.c b/contrib/network/netsurf/libdom/src/core/attr.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/attr.c
rename to contrib/network/netsurf/libdom/src/core/attr.c
diff --git a/programs/network/netsurf/libdom/src/core/attr.h b/contrib/network/netsurf/libdom/src/core/attr.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/attr.h
rename to contrib/network/netsurf/libdom/src/core/attr.h
diff --git a/programs/network/netsurf/libdom/src/core/cdatasection.c b/contrib/network/netsurf/libdom/src/core/cdatasection.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/cdatasection.c
rename to contrib/network/netsurf/libdom/src/core/cdatasection.c
diff --git a/programs/network/netsurf/libdom/src/core/cdatasection.h b/contrib/network/netsurf/libdom/src/core/cdatasection.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/cdatasection.h
rename to contrib/network/netsurf/libdom/src/core/cdatasection.h
diff --git a/programs/network/netsurf/libdom/src/core/characterdata.c b/contrib/network/netsurf/libdom/src/core/characterdata.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/characterdata.c
rename to contrib/network/netsurf/libdom/src/core/characterdata.c
diff --git a/programs/network/netsurf/libdom/src/core/characterdata.h b/contrib/network/netsurf/libdom/src/core/characterdata.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/characterdata.h
rename to contrib/network/netsurf/libdom/src/core/characterdata.h
diff --git a/programs/network/netsurf/libdom/src/core/comment.c b/contrib/network/netsurf/libdom/src/core/comment.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/comment.c
rename to contrib/network/netsurf/libdom/src/core/comment.c
diff --git a/programs/network/netsurf/libdom/src/core/comment.h b/contrib/network/netsurf/libdom/src/core/comment.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/comment.h
rename to contrib/network/netsurf/libdom/src/core/comment.h
diff --git a/programs/network/netsurf/libdom/src/core/doc_fragment.c b/contrib/network/netsurf/libdom/src/core/doc_fragment.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/doc_fragment.c
rename to contrib/network/netsurf/libdom/src/core/doc_fragment.c
diff --git a/programs/network/netsurf/libdom/src/core/doc_fragment.h b/contrib/network/netsurf/libdom/src/core/doc_fragment.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/doc_fragment.h
rename to contrib/network/netsurf/libdom/src/core/doc_fragment.h
diff --git a/programs/network/netsurf/libdom/src/core/document.c b/contrib/network/netsurf/libdom/src/core/document.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/document.c
rename to contrib/network/netsurf/libdom/src/core/document.c
diff --git a/programs/network/netsurf/libdom/src/core/document.h b/contrib/network/netsurf/libdom/src/core/document.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/document.h
rename to contrib/network/netsurf/libdom/src/core/document.h
diff --git a/programs/network/netsurf/libdom/src/core/document_type.c b/contrib/network/netsurf/libdom/src/core/document_type.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/document_type.c
rename to contrib/network/netsurf/libdom/src/core/document_type.c
diff --git a/programs/network/netsurf/libdom/src/core/document_type.h b/contrib/network/netsurf/libdom/src/core/document_type.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/document_type.h
rename to contrib/network/netsurf/libdom/src/core/document_type.h
diff --git a/programs/network/netsurf/libdom/src/core/element.c b/contrib/network/netsurf/libdom/src/core/element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/element.c
rename to contrib/network/netsurf/libdom/src/core/element.c
diff --git a/programs/network/netsurf/libdom/src/core/element.h b/contrib/network/netsurf/libdom/src/core/element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/element.h
rename to contrib/network/netsurf/libdom/src/core/element.h
diff --git a/programs/network/netsurf/libdom/src/core/entity_ref.c b/contrib/network/netsurf/libdom/src/core/entity_ref.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/entity_ref.c
rename to contrib/network/netsurf/libdom/src/core/entity_ref.c
diff --git a/programs/network/netsurf/libdom/src/core/entity_ref.h b/contrib/network/netsurf/libdom/src/core/entity_ref.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/entity_ref.h
rename to contrib/network/netsurf/libdom/src/core/entity_ref.h
diff --git a/programs/network/netsurf/libdom/src/core/implementation.c b/contrib/network/netsurf/libdom/src/core/implementation.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/implementation.c
rename to contrib/network/netsurf/libdom/src/core/implementation.c
diff --git a/programs/network/netsurf/libdom/src/core/namednodemap.c b/contrib/network/netsurf/libdom/src/core/namednodemap.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/namednodemap.c
rename to contrib/network/netsurf/libdom/src/core/namednodemap.c
diff --git a/programs/network/netsurf/libdom/src/core/namednodemap.h b/contrib/network/netsurf/libdom/src/core/namednodemap.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/namednodemap.h
rename to contrib/network/netsurf/libdom/src/core/namednodemap.h
diff --git a/programs/network/netsurf/libdom/src/core/node.c b/contrib/network/netsurf/libdom/src/core/node.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/node.c
rename to contrib/network/netsurf/libdom/src/core/node.c
diff --git a/programs/network/netsurf/libdom/src/core/node.h b/contrib/network/netsurf/libdom/src/core/node.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/node.h
rename to contrib/network/netsurf/libdom/src/core/node.h
diff --git a/programs/network/netsurf/libdom/src/core/nodelist.c b/contrib/network/netsurf/libdom/src/core/nodelist.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/nodelist.c
rename to contrib/network/netsurf/libdom/src/core/nodelist.c
diff --git a/programs/network/netsurf/libdom/src/core/nodelist.h b/contrib/network/netsurf/libdom/src/core/nodelist.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/nodelist.h
rename to contrib/network/netsurf/libdom/src/core/nodelist.h
diff --git a/programs/network/netsurf/libdom/src/core/pi.c b/contrib/network/netsurf/libdom/src/core/pi.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/pi.c
rename to contrib/network/netsurf/libdom/src/core/pi.c
diff --git a/programs/network/netsurf/libdom/src/core/pi.h b/contrib/network/netsurf/libdom/src/core/pi.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/pi.h
rename to contrib/network/netsurf/libdom/src/core/pi.h
diff --git a/programs/network/netsurf/libdom/src/core/string.c b/contrib/network/netsurf/libdom/src/core/string.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/string.c
rename to contrib/network/netsurf/libdom/src/core/string.c
diff --git a/programs/network/netsurf/libdom/src/core/string.h b/contrib/network/netsurf/libdom/src/core/string.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/string.h
rename to contrib/network/netsurf/libdom/src/core/string.h
diff --git a/programs/network/netsurf/libdom/src/core/text.c b/contrib/network/netsurf/libdom/src/core/text.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/text.c
rename to contrib/network/netsurf/libdom/src/core/text.c
diff --git a/programs/network/netsurf/libdom/src/core/text.h b/contrib/network/netsurf/libdom/src/core/text.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/text.h
rename to contrib/network/netsurf/libdom/src/core/text.h
diff --git a/programs/network/netsurf/libdom/src/core/typeinfo.c b/contrib/network/netsurf/libdom/src/core/typeinfo.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/core/typeinfo.c
rename to contrib/network/netsurf/libdom/src/core/typeinfo.c
diff --git a/programs/network/netsurf/libdom/src/events/Makefile b/contrib/network/netsurf/libdom/src/events/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/Makefile
rename to contrib/network/netsurf/libdom/src/events/Makefile
diff --git a/programs/network/netsurf/libdom/src/events/custom_event.c b/contrib/network/netsurf/libdom/src/events/custom_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/custom_event.c
rename to contrib/network/netsurf/libdom/src/events/custom_event.c
diff --git a/programs/network/netsurf/libdom/src/events/custom_event.h b/contrib/network/netsurf/libdom/src/events/custom_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/custom_event.h
rename to contrib/network/netsurf/libdom/src/events/custom_event.h
diff --git a/programs/network/netsurf/libdom/src/events/dispatch.c b/contrib/network/netsurf/libdom/src/events/dispatch.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/dispatch.c
rename to contrib/network/netsurf/libdom/src/events/dispatch.c
diff --git a/programs/network/netsurf/libdom/src/events/dispatch.h b/contrib/network/netsurf/libdom/src/events/dispatch.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/dispatch.h
rename to contrib/network/netsurf/libdom/src/events/dispatch.h
diff --git a/programs/network/netsurf/libdom/src/events/document_event.c b/contrib/network/netsurf/libdom/src/events/document_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/document_event.c
rename to contrib/network/netsurf/libdom/src/events/document_event.c
diff --git a/programs/network/netsurf/libdom/src/events/document_event.h b/contrib/network/netsurf/libdom/src/events/document_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/document_event.h
rename to contrib/network/netsurf/libdom/src/events/document_event.h
diff --git a/programs/network/netsurf/libdom/src/events/event.c b/contrib/network/netsurf/libdom/src/events/event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/event.c
rename to contrib/network/netsurf/libdom/src/events/event.c
diff --git a/programs/network/netsurf/libdom/src/events/event.h b/contrib/network/netsurf/libdom/src/events/event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/event.h
rename to contrib/network/netsurf/libdom/src/events/event.h
diff --git a/programs/network/netsurf/libdom/src/events/event_listener.c b/contrib/network/netsurf/libdom/src/events/event_listener.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/event_listener.c
rename to contrib/network/netsurf/libdom/src/events/event_listener.c
diff --git a/programs/network/netsurf/libdom/src/events/event_listener.h b/contrib/network/netsurf/libdom/src/events/event_listener.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/event_listener.h
rename to contrib/network/netsurf/libdom/src/events/event_listener.h
diff --git a/programs/network/netsurf/libdom/src/events/event_target.c b/contrib/network/netsurf/libdom/src/events/event_target.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/event_target.c
rename to contrib/network/netsurf/libdom/src/events/event_target.c
diff --git a/programs/network/netsurf/libdom/src/events/event_target.h b/contrib/network/netsurf/libdom/src/events/event_target.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/event_target.h
rename to contrib/network/netsurf/libdom/src/events/event_target.h
diff --git a/programs/network/netsurf/libdom/src/events/keyboard_event.c b/contrib/network/netsurf/libdom/src/events/keyboard_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/keyboard_event.c
rename to contrib/network/netsurf/libdom/src/events/keyboard_event.c
diff --git a/programs/network/netsurf/libdom/src/events/keyboard_event.h b/contrib/network/netsurf/libdom/src/events/keyboard_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/keyboard_event.h
rename to contrib/network/netsurf/libdom/src/events/keyboard_event.h
diff --git a/programs/network/netsurf/libdom/src/events/mouse_event.c b/contrib/network/netsurf/libdom/src/events/mouse_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mouse_event.c
rename to contrib/network/netsurf/libdom/src/events/mouse_event.c
diff --git a/programs/network/netsurf/libdom/src/events/mouse_event.h b/contrib/network/netsurf/libdom/src/events/mouse_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mouse_event.h
rename to contrib/network/netsurf/libdom/src/events/mouse_event.h
diff --git a/programs/network/netsurf/libdom/src/events/mouse_multi_wheel_event.c b/contrib/network/netsurf/libdom/src/events/mouse_multi_wheel_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mouse_multi_wheel_event.c
rename to contrib/network/netsurf/libdom/src/events/mouse_multi_wheel_event.c
diff --git a/programs/network/netsurf/libdom/src/events/mouse_multi_wheel_event.h b/contrib/network/netsurf/libdom/src/events/mouse_multi_wheel_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mouse_multi_wheel_event.h
rename to contrib/network/netsurf/libdom/src/events/mouse_multi_wheel_event.h
diff --git a/programs/network/netsurf/libdom/src/events/mouse_wheel_event.c b/contrib/network/netsurf/libdom/src/events/mouse_wheel_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mouse_wheel_event.c
rename to contrib/network/netsurf/libdom/src/events/mouse_wheel_event.c
diff --git a/programs/network/netsurf/libdom/src/events/mouse_wheel_event.h b/contrib/network/netsurf/libdom/src/events/mouse_wheel_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mouse_wheel_event.h
rename to contrib/network/netsurf/libdom/src/events/mouse_wheel_event.h
diff --git a/programs/network/netsurf/libdom/src/events/mutation_event.c b/contrib/network/netsurf/libdom/src/events/mutation_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mutation_event.c
rename to contrib/network/netsurf/libdom/src/events/mutation_event.c
diff --git a/programs/network/netsurf/libdom/src/events/mutation_event.h b/contrib/network/netsurf/libdom/src/events/mutation_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mutation_event.h
rename to contrib/network/netsurf/libdom/src/events/mutation_event.h
diff --git a/programs/network/netsurf/libdom/src/events/mutation_name_event.c b/contrib/network/netsurf/libdom/src/events/mutation_name_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mutation_name_event.c
rename to contrib/network/netsurf/libdom/src/events/mutation_name_event.c
diff --git a/programs/network/netsurf/libdom/src/events/mutation_name_event.h b/contrib/network/netsurf/libdom/src/events/mutation_name_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/mutation_name_event.h
rename to contrib/network/netsurf/libdom/src/events/mutation_name_event.h
diff --git a/programs/network/netsurf/libdom/src/events/text_event.c b/contrib/network/netsurf/libdom/src/events/text_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/text_event.c
rename to contrib/network/netsurf/libdom/src/events/text_event.c
diff --git a/programs/network/netsurf/libdom/src/events/text_event.h b/contrib/network/netsurf/libdom/src/events/text_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/text_event.h
rename to contrib/network/netsurf/libdom/src/events/text_event.h
diff --git a/programs/network/netsurf/libdom/src/events/ui_event.c b/contrib/network/netsurf/libdom/src/events/ui_event.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/ui_event.c
rename to contrib/network/netsurf/libdom/src/events/ui_event.c
diff --git a/programs/network/netsurf/libdom/src/events/ui_event.h b/contrib/network/netsurf/libdom/src/events/ui_event.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/events/ui_event.h
rename to contrib/network/netsurf/libdom/src/events/ui_event.h
diff --git a/programs/network/netsurf/libdom/src/html/Makefile b/contrib/network/netsurf/libdom/src/html/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/Makefile
rename to contrib/network/netsurf/libdom/src/html/Makefile
diff --git a/programs/network/netsurf/libdom/src/html/TODO b/contrib/network/netsurf/libdom/src/html/TODO
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/TODO
rename to contrib/network/netsurf/libdom/src/html/TODO
diff --git a/programs/network/netsurf/libdom/src/html/html_anchor_element.c b/contrib/network/netsurf/libdom/src/html/html_anchor_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_anchor_element.c
rename to contrib/network/netsurf/libdom/src/html/html_anchor_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_anchor_element.h b/contrib/network/netsurf/libdom/src/html/html_anchor_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_anchor_element.h
rename to contrib/network/netsurf/libdom/src/html/html_anchor_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_applet_element.c b/contrib/network/netsurf/libdom/src/html/html_applet_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_applet_element.c
rename to contrib/network/netsurf/libdom/src/html/html_applet_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_applet_element.h b/contrib/network/netsurf/libdom/src/html/html_applet_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_applet_element.h
rename to contrib/network/netsurf/libdom/src/html/html_applet_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_area_element.c b/contrib/network/netsurf/libdom/src/html/html_area_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_area_element.c
rename to contrib/network/netsurf/libdom/src/html/html_area_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_area_element.h b/contrib/network/netsurf/libdom/src/html/html_area_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_area_element.h
rename to contrib/network/netsurf/libdom/src/html/html_area_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_base_element.c b/contrib/network/netsurf/libdom/src/html/html_base_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_base_element.c
rename to contrib/network/netsurf/libdom/src/html/html_base_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_base_element.h b/contrib/network/netsurf/libdom/src/html/html_base_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_base_element.h
rename to contrib/network/netsurf/libdom/src/html/html_base_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_basefont_element.c b/contrib/network/netsurf/libdom/src/html/html_basefont_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_basefont_element.c
rename to contrib/network/netsurf/libdom/src/html/html_basefont_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_basefont_element.h b/contrib/network/netsurf/libdom/src/html/html_basefont_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_basefont_element.h
rename to contrib/network/netsurf/libdom/src/html/html_basefont_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_body_element.c b/contrib/network/netsurf/libdom/src/html/html_body_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_body_element.c
rename to contrib/network/netsurf/libdom/src/html/html_body_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_body_element.h b/contrib/network/netsurf/libdom/src/html/html_body_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_body_element.h
rename to contrib/network/netsurf/libdom/src/html/html_body_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_br_element.c b/contrib/network/netsurf/libdom/src/html/html_br_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_br_element.c
rename to contrib/network/netsurf/libdom/src/html/html_br_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_br_element.h b/contrib/network/netsurf/libdom/src/html/html_br_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_br_element.h
rename to contrib/network/netsurf/libdom/src/html/html_br_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_button_element.c b/contrib/network/netsurf/libdom/src/html/html_button_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_button_element.c
rename to contrib/network/netsurf/libdom/src/html/html_button_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_button_element.h b/contrib/network/netsurf/libdom/src/html/html_button_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_button_element.h
rename to contrib/network/netsurf/libdom/src/html/html_button_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_collection.c b/contrib/network/netsurf/libdom/src/html/html_collection.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_collection.c
rename to contrib/network/netsurf/libdom/src/html/html_collection.c
diff --git a/programs/network/netsurf/libdom/src/html/html_collection.h b/contrib/network/netsurf/libdom/src/html/html_collection.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_collection.h
rename to contrib/network/netsurf/libdom/src/html/html_collection.h
diff --git a/programs/network/netsurf/libdom/src/html/html_directory_element.c b/contrib/network/netsurf/libdom/src/html/html_directory_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_directory_element.c
rename to contrib/network/netsurf/libdom/src/html/html_directory_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_directory_element.h b/contrib/network/netsurf/libdom/src/html/html_directory_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_directory_element.h
rename to contrib/network/netsurf/libdom/src/html/html_directory_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_div_element.c b/contrib/network/netsurf/libdom/src/html/html_div_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_div_element.c
rename to contrib/network/netsurf/libdom/src/html/html_div_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_div_element.h b/contrib/network/netsurf/libdom/src/html/html_div_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_div_element.h
rename to contrib/network/netsurf/libdom/src/html/html_div_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_dlist_element.c b/contrib/network/netsurf/libdom/src/html/html_dlist_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_dlist_element.c
rename to contrib/network/netsurf/libdom/src/html/html_dlist_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_dlist_element.h b/contrib/network/netsurf/libdom/src/html/html_dlist_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_dlist_element.h
rename to contrib/network/netsurf/libdom/src/html/html_dlist_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_document.c b/contrib/network/netsurf/libdom/src/html/html_document.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_document.c
rename to contrib/network/netsurf/libdom/src/html/html_document.c
diff --git a/programs/network/netsurf/libdom/src/html/html_document.h b/contrib/network/netsurf/libdom/src/html/html_document.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_document.h
rename to contrib/network/netsurf/libdom/src/html/html_document.h
diff --git a/programs/network/netsurf/libdom/src/html/html_document_strings.h b/contrib/network/netsurf/libdom/src/html/html_document_strings.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_document_strings.h
rename to contrib/network/netsurf/libdom/src/html/html_document_strings.h
diff --git a/programs/network/netsurf/libdom/src/html/html_element.c b/contrib/network/netsurf/libdom/src/html/html_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_element.c
rename to contrib/network/netsurf/libdom/src/html/html_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_element.h b/contrib/network/netsurf/libdom/src/html/html_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_element.h
rename to contrib/network/netsurf/libdom/src/html/html_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_fieldset_element.c b/contrib/network/netsurf/libdom/src/html/html_fieldset_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_fieldset_element.c
rename to contrib/network/netsurf/libdom/src/html/html_fieldset_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_fieldset_element.h b/contrib/network/netsurf/libdom/src/html/html_fieldset_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_fieldset_element.h
rename to contrib/network/netsurf/libdom/src/html/html_fieldset_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_font_element.c b/contrib/network/netsurf/libdom/src/html/html_font_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_font_element.c
rename to contrib/network/netsurf/libdom/src/html/html_font_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_font_element.h b/contrib/network/netsurf/libdom/src/html/html_font_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_font_element.h
rename to contrib/network/netsurf/libdom/src/html/html_font_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_form_element.c b/contrib/network/netsurf/libdom/src/html/html_form_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_form_element.c
rename to contrib/network/netsurf/libdom/src/html/html_form_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_form_element.h b/contrib/network/netsurf/libdom/src/html/html_form_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_form_element.h
rename to contrib/network/netsurf/libdom/src/html/html_form_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_frame_element.c b/contrib/network/netsurf/libdom/src/html/html_frame_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_frame_element.c
rename to contrib/network/netsurf/libdom/src/html/html_frame_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_frame_element.h b/contrib/network/netsurf/libdom/src/html/html_frame_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_frame_element.h
rename to contrib/network/netsurf/libdom/src/html/html_frame_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_frameset_element.c b/contrib/network/netsurf/libdom/src/html/html_frameset_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_frameset_element.c
rename to contrib/network/netsurf/libdom/src/html/html_frameset_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_frameset_element.h b/contrib/network/netsurf/libdom/src/html/html_frameset_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_frameset_element.h
rename to contrib/network/netsurf/libdom/src/html/html_frameset_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_head_element.c b/contrib/network/netsurf/libdom/src/html/html_head_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_head_element.c
rename to contrib/network/netsurf/libdom/src/html/html_head_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_head_element.h b/contrib/network/netsurf/libdom/src/html/html_head_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_head_element.h
rename to contrib/network/netsurf/libdom/src/html/html_head_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_heading_element.c b/contrib/network/netsurf/libdom/src/html/html_heading_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_heading_element.c
rename to contrib/network/netsurf/libdom/src/html/html_heading_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_heading_element.h b/contrib/network/netsurf/libdom/src/html/html_heading_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_heading_element.h
rename to contrib/network/netsurf/libdom/src/html/html_heading_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_hr_element.c b/contrib/network/netsurf/libdom/src/html/html_hr_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_hr_element.c
rename to contrib/network/netsurf/libdom/src/html/html_hr_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_hr_element.h b/contrib/network/netsurf/libdom/src/html/html_hr_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_hr_element.h
rename to contrib/network/netsurf/libdom/src/html/html_hr_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_html_element.c b/contrib/network/netsurf/libdom/src/html/html_html_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_html_element.c
rename to contrib/network/netsurf/libdom/src/html/html_html_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_html_element.h b/contrib/network/netsurf/libdom/src/html/html_html_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_html_element.h
rename to contrib/network/netsurf/libdom/src/html/html_html_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_iframe_element.c b/contrib/network/netsurf/libdom/src/html/html_iframe_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_iframe_element.c
rename to contrib/network/netsurf/libdom/src/html/html_iframe_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_iframe_element.h b/contrib/network/netsurf/libdom/src/html/html_iframe_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_iframe_element.h
rename to contrib/network/netsurf/libdom/src/html/html_iframe_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_image_element.c b/contrib/network/netsurf/libdom/src/html/html_image_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_image_element.c
rename to contrib/network/netsurf/libdom/src/html/html_image_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_image_element.h b/contrib/network/netsurf/libdom/src/html/html_image_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_image_element.h
rename to contrib/network/netsurf/libdom/src/html/html_image_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_input_element.c b/contrib/network/netsurf/libdom/src/html/html_input_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_input_element.c
rename to contrib/network/netsurf/libdom/src/html/html_input_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_input_element.h b/contrib/network/netsurf/libdom/src/html/html_input_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_input_element.h
rename to contrib/network/netsurf/libdom/src/html/html_input_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_isindex_element.c b/contrib/network/netsurf/libdom/src/html/html_isindex_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_isindex_element.c
rename to contrib/network/netsurf/libdom/src/html/html_isindex_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_isindex_element.h b/contrib/network/netsurf/libdom/src/html/html_isindex_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_isindex_element.h
rename to contrib/network/netsurf/libdom/src/html/html_isindex_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_label_element.c b/contrib/network/netsurf/libdom/src/html/html_label_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_label_element.c
rename to contrib/network/netsurf/libdom/src/html/html_label_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_label_element.h b/contrib/network/netsurf/libdom/src/html/html_label_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_label_element.h
rename to contrib/network/netsurf/libdom/src/html/html_label_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_legend_element.c b/contrib/network/netsurf/libdom/src/html/html_legend_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_legend_element.c
rename to contrib/network/netsurf/libdom/src/html/html_legend_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_legend_element.h b/contrib/network/netsurf/libdom/src/html/html_legend_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_legend_element.h
rename to contrib/network/netsurf/libdom/src/html/html_legend_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_li_element.c b/contrib/network/netsurf/libdom/src/html/html_li_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_li_element.c
rename to contrib/network/netsurf/libdom/src/html/html_li_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_li_element.h b/contrib/network/netsurf/libdom/src/html/html_li_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_li_element.h
rename to contrib/network/netsurf/libdom/src/html/html_li_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_link_element.c b/contrib/network/netsurf/libdom/src/html/html_link_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_link_element.c
rename to contrib/network/netsurf/libdom/src/html/html_link_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_link_element.h b/contrib/network/netsurf/libdom/src/html/html_link_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_link_element.h
rename to contrib/network/netsurf/libdom/src/html/html_link_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_map_element.c b/contrib/network/netsurf/libdom/src/html/html_map_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_map_element.c
rename to contrib/network/netsurf/libdom/src/html/html_map_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_map_element.h b/contrib/network/netsurf/libdom/src/html/html_map_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_map_element.h
rename to contrib/network/netsurf/libdom/src/html/html_map_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_menu_element.c b/contrib/network/netsurf/libdom/src/html/html_menu_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_menu_element.c
rename to contrib/network/netsurf/libdom/src/html/html_menu_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_menu_element.h b/contrib/network/netsurf/libdom/src/html/html_menu_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_menu_element.h
rename to contrib/network/netsurf/libdom/src/html/html_menu_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_meta_element.c b/contrib/network/netsurf/libdom/src/html/html_meta_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_meta_element.c
rename to contrib/network/netsurf/libdom/src/html/html_meta_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_meta_element.h b/contrib/network/netsurf/libdom/src/html/html_meta_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_meta_element.h
rename to contrib/network/netsurf/libdom/src/html/html_meta_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_mod_element.c b/contrib/network/netsurf/libdom/src/html/html_mod_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_mod_element.c
rename to contrib/network/netsurf/libdom/src/html/html_mod_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_mod_element.h b/contrib/network/netsurf/libdom/src/html/html_mod_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_mod_element.h
rename to contrib/network/netsurf/libdom/src/html/html_mod_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_object_element.c b/contrib/network/netsurf/libdom/src/html/html_object_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_object_element.c
rename to contrib/network/netsurf/libdom/src/html/html_object_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_object_element.h b/contrib/network/netsurf/libdom/src/html/html_object_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_object_element.h
rename to contrib/network/netsurf/libdom/src/html/html_object_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_olist_element.c b/contrib/network/netsurf/libdom/src/html/html_olist_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_olist_element.c
rename to contrib/network/netsurf/libdom/src/html/html_olist_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_olist_element.h b/contrib/network/netsurf/libdom/src/html/html_olist_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_olist_element.h
rename to contrib/network/netsurf/libdom/src/html/html_olist_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_opt_group_element.c b/contrib/network/netsurf/libdom/src/html/html_opt_group_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_opt_group_element.c
rename to contrib/network/netsurf/libdom/src/html/html_opt_group_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_opt_group_element.h b/contrib/network/netsurf/libdom/src/html/html_opt_group_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_opt_group_element.h
rename to contrib/network/netsurf/libdom/src/html/html_opt_group_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_option_element.c b/contrib/network/netsurf/libdom/src/html/html_option_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_option_element.c
rename to contrib/network/netsurf/libdom/src/html/html_option_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_option_element.h b/contrib/network/netsurf/libdom/src/html/html_option_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_option_element.h
rename to contrib/network/netsurf/libdom/src/html/html_option_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_options_collection.c b/contrib/network/netsurf/libdom/src/html/html_options_collection.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_options_collection.c
rename to contrib/network/netsurf/libdom/src/html/html_options_collection.c
diff --git a/programs/network/netsurf/libdom/src/html/html_options_collection.h b/contrib/network/netsurf/libdom/src/html/html_options_collection.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_options_collection.h
rename to contrib/network/netsurf/libdom/src/html/html_options_collection.h
diff --git a/programs/network/netsurf/libdom/src/html/html_paragraph_element.c b/contrib/network/netsurf/libdom/src/html/html_paragraph_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_paragraph_element.c
rename to contrib/network/netsurf/libdom/src/html/html_paragraph_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_paragraph_element.h b/contrib/network/netsurf/libdom/src/html/html_paragraph_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_paragraph_element.h
rename to contrib/network/netsurf/libdom/src/html/html_paragraph_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_param_element.c b/contrib/network/netsurf/libdom/src/html/html_param_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_param_element.c
rename to contrib/network/netsurf/libdom/src/html/html_param_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_param_element.h b/contrib/network/netsurf/libdom/src/html/html_param_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_param_element.h
rename to contrib/network/netsurf/libdom/src/html/html_param_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_pre_element.c b/contrib/network/netsurf/libdom/src/html/html_pre_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_pre_element.c
rename to contrib/network/netsurf/libdom/src/html/html_pre_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_pre_element.h b/contrib/network/netsurf/libdom/src/html/html_pre_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_pre_element.h
rename to contrib/network/netsurf/libdom/src/html/html_pre_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_quote_element.c b/contrib/network/netsurf/libdom/src/html/html_quote_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_quote_element.c
rename to contrib/network/netsurf/libdom/src/html/html_quote_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_quote_element.h b/contrib/network/netsurf/libdom/src/html/html_quote_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_quote_element.h
rename to contrib/network/netsurf/libdom/src/html/html_quote_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_script_element.c b/contrib/network/netsurf/libdom/src/html/html_script_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_script_element.c
rename to contrib/network/netsurf/libdom/src/html/html_script_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_script_element.h b/contrib/network/netsurf/libdom/src/html/html_script_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_script_element.h
rename to contrib/network/netsurf/libdom/src/html/html_script_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_select_element.c b/contrib/network/netsurf/libdom/src/html/html_select_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_select_element.c
rename to contrib/network/netsurf/libdom/src/html/html_select_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_select_element.h b/contrib/network/netsurf/libdom/src/html/html_select_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_select_element.h
rename to contrib/network/netsurf/libdom/src/html/html_select_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_style_element.c b/contrib/network/netsurf/libdom/src/html/html_style_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_style_element.c
rename to contrib/network/netsurf/libdom/src/html/html_style_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_style_element.h b/contrib/network/netsurf/libdom/src/html/html_style_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_style_element.h
rename to contrib/network/netsurf/libdom/src/html/html_style_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_table_element.c b/contrib/network/netsurf/libdom/src/html/html_table_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_table_element.c
rename to contrib/network/netsurf/libdom/src/html/html_table_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_table_element.h b/contrib/network/netsurf/libdom/src/html/html_table_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_table_element.h
rename to contrib/network/netsurf/libdom/src/html/html_table_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_tablecaption_element.c b/contrib/network/netsurf/libdom/src/html/html_tablecaption_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablecaption_element.c
rename to contrib/network/netsurf/libdom/src/html/html_tablecaption_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_tablecaption_element.h b/contrib/network/netsurf/libdom/src/html/html_tablecaption_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablecaption_element.h
rename to contrib/network/netsurf/libdom/src/html/html_tablecaption_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_tablecell_element.c b/contrib/network/netsurf/libdom/src/html/html_tablecell_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablecell_element.c
rename to contrib/network/netsurf/libdom/src/html/html_tablecell_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_tablecell_element.h b/contrib/network/netsurf/libdom/src/html/html_tablecell_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablecell_element.h
rename to contrib/network/netsurf/libdom/src/html/html_tablecell_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_tablecol_element.c b/contrib/network/netsurf/libdom/src/html/html_tablecol_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablecol_element.c
rename to contrib/network/netsurf/libdom/src/html/html_tablecol_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_tablecol_element.h b/contrib/network/netsurf/libdom/src/html/html_tablecol_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablecol_element.h
rename to contrib/network/netsurf/libdom/src/html/html_tablecol_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_tablerow_element.c b/contrib/network/netsurf/libdom/src/html/html_tablerow_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablerow_element.c
rename to contrib/network/netsurf/libdom/src/html/html_tablerow_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_tablerow_element.h b/contrib/network/netsurf/libdom/src/html/html_tablerow_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablerow_element.h
rename to contrib/network/netsurf/libdom/src/html/html_tablerow_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_tablesection_element.c b/contrib/network/netsurf/libdom/src/html/html_tablesection_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablesection_element.c
rename to contrib/network/netsurf/libdom/src/html/html_tablesection_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_tablesection_element.h b/contrib/network/netsurf/libdom/src/html/html_tablesection_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_tablesection_element.h
rename to contrib/network/netsurf/libdom/src/html/html_tablesection_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_text_area_element.c b/contrib/network/netsurf/libdom/src/html/html_text_area_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_text_area_element.c
rename to contrib/network/netsurf/libdom/src/html/html_text_area_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_text_area_element.h b/contrib/network/netsurf/libdom/src/html/html_text_area_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_text_area_element.h
rename to contrib/network/netsurf/libdom/src/html/html_text_area_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_title_element.c b/contrib/network/netsurf/libdom/src/html/html_title_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_title_element.c
rename to contrib/network/netsurf/libdom/src/html/html_title_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_title_element.h b/contrib/network/netsurf/libdom/src/html/html_title_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_title_element.h
rename to contrib/network/netsurf/libdom/src/html/html_title_element.h
diff --git a/programs/network/netsurf/libdom/src/html/html_ulist_element.c b/contrib/network/netsurf/libdom/src/html/html_ulist_element.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_ulist_element.c
rename to contrib/network/netsurf/libdom/src/html/html_ulist_element.c
diff --git a/programs/network/netsurf/libdom/src/html/html_ulist_element.h b/contrib/network/netsurf/libdom/src/html/html_ulist_element.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/html/html_ulist_element.h
rename to contrib/network/netsurf/libdom/src/html/html_ulist_element.h
diff --git a/programs/network/netsurf/libdom/src/utils/Makefile b/contrib/network/netsurf/libdom/src/utils/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/Makefile
rename to contrib/network/netsurf/libdom/src/utils/Makefile
diff --git a/programs/network/netsurf/libdom/src/utils/character_valid.c b/contrib/network/netsurf/libdom/src/utils/character_valid.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/character_valid.c
rename to contrib/network/netsurf/libdom/src/utils/character_valid.c
diff --git a/programs/network/netsurf/libdom/src/utils/character_valid.h b/contrib/network/netsurf/libdom/src/utils/character_valid.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/character_valid.h
rename to contrib/network/netsurf/libdom/src/utils/character_valid.h
diff --git a/programs/network/netsurf/libdom/src/utils/hashtable.c b/contrib/network/netsurf/libdom/src/utils/hashtable.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/hashtable.c
rename to contrib/network/netsurf/libdom/src/utils/hashtable.c
diff --git a/programs/network/netsurf/libdom/src/utils/hashtable.h b/contrib/network/netsurf/libdom/src/utils/hashtable.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/hashtable.h
rename to contrib/network/netsurf/libdom/src/utils/hashtable.h
diff --git a/programs/network/netsurf/libdom/src/utils/list.h b/contrib/network/netsurf/libdom/src/utils/list.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/list.h
rename to contrib/network/netsurf/libdom/src/utils/list.h
diff --git a/programs/network/netsurf/libdom/src/utils/namespace.c b/contrib/network/netsurf/libdom/src/utils/namespace.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/namespace.c
rename to contrib/network/netsurf/libdom/src/utils/namespace.c
diff --git a/programs/network/netsurf/libdom/src/utils/namespace.h b/contrib/network/netsurf/libdom/src/utils/namespace.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/namespace.h
rename to contrib/network/netsurf/libdom/src/utils/namespace.h
diff --git a/programs/network/netsurf/libdom/src/utils/utils.h b/contrib/network/netsurf/libdom/src/utils/utils.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/utils.h
rename to contrib/network/netsurf/libdom/src/utils/utils.h
diff --git a/programs/network/netsurf/libdom/src/utils/validate.c b/contrib/network/netsurf/libdom/src/utils/validate.c
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/validate.c
rename to contrib/network/netsurf/libdom/src/utils/validate.c
diff --git a/programs/network/netsurf/libdom/src/utils/validate.h b/contrib/network/netsurf/libdom/src/utils/validate.h
similarity index 100%
rename from programs/network/netsurf/libdom/src/utils/validate.h
rename to contrib/network/netsurf/libdom/src/utils/validate.h
diff --git a/programs/network/netsurf/libdom/test/DOMTSHandler.pm b/contrib/network/netsurf/libdom/test/DOMTSHandler.pm
similarity index 100%
rename from programs/network/netsurf/libdom/test/DOMTSHandler.pm
rename to contrib/network/netsurf/libdom/test/DOMTSHandler.pm
diff --git a/programs/network/netsurf/libdom/test/Makefile b/contrib/network/netsurf/libdom/test/Makefile
similarity index 100%
rename from programs/network/netsurf/libdom/test/Makefile
rename to contrib/network/netsurf/libdom/test/Makefile
diff --git a/programs/network/netsurf/libdom/test/build-test.sh b/contrib/network/netsurf/libdom/test/build-test.sh
similarity index 100%
rename from programs/network/netsurf/libdom/test/build-test.sh
rename to contrib/network/netsurf/libdom/test/build-test.sh
diff --git a/programs/network/netsurf/libdom/test/dom1-interfaces.xml b/contrib/network/netsurf/libdom/test/dom1-interfaces.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/dom1-interfaces.xml
rename to contrib/network/netsurf/libdom/test/dom1-interfaces.xml
diff --git a/programs/network/netsurf/libdom/test/dom2-core-interface.xml b/contrib/network/netsurf/libdom/test/dom2-core-interface.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/dom2-core-interface.xml
rename to contrib/network/netsurf/libdom/test/dom2-core-interface.xml
diff --git a/programs/network/netsurf/libdom/test/dom2-events-interface.xml b/contrib/network/netsurf/libdom/test/dom2-events-interface.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/dom2-events-interface.xml
rename to contrib/network/netsurf/libdom/test/dom2-events-interface.xml
diff --git a/programs/network/netsurf/libdom/test/dom3-core-interface.xml b/contrib/network/netsurf/libdom/test/dom3-core-interface.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/dom3-core-interface.xml
rename to contrib/network/netsurf/libdom/test/dom3-core-interface.xml
diff --git a/programs/network/netsurf/libdom/test/dom3-events-interface.xml b/contrib/network/netsurf/libdom/test/dom3-events-interface.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/dom3-events-interface.xml
rename to contrib/network/netsurf/libdom/test/dom3-events-interface.xml
diff --git a/programs/network/netsurf/libdom/test/leak-test.sh b/contrib/network/netsurf/libdom/test/leak-test.sh
similarity index 100%
rename from programs/network/netsurf/libdom/test/leak-test.sh
rename to contrib/network/netsurf/libdom/test/leak-test.sh
diff --git a/programs/network/netsurf/libdom/test/run-single-test.sh b/contrib/network/netsurf/libdom/test/run-single-test.sh
similarity index 100%
rename from programs/network/netsurf/libdom/test/run-single-test.sh
rename to contrib/network/netsurf/libdom/test/run-single-test.sh
diff --git a/programs/network/netsurf/libdom/test/run-test.sh b/contrib/network/netsurf/libdom/test/run-test.sh
similarity index 100%
rename from programs/network/netsurf/libdom/test/run-test.sh
rename to contrib/network/netsurf/libdom/test/run-test.sh
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatedocumentfragment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatedocumentfragment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatedocumentfragment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatedocumentfragment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrcreatetextnode2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrdefaultvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrdefaultvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrdefaultvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrdefaultvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attreffectivevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attreffectivevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attreffectivevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attreffectivevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrentityreplacement.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrentityreplacement.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrentityreplacement.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrentityreplacement.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrnextsiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrnextsiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrnextsiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrnextsiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrnotspecifiedvalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrnotspecifiedvalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrnotspecifiedvalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrnotspecifiedvalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrparentnodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrparentnodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrparentnodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrparentnodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrprevioussiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrprevioussiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrprevioussiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrprevioussiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrremovechild1.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrremovechild1.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrremovechild1.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrremovechild1.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrreplacechild1.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrreplacechild1.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrreplacechild1.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrreplacechild1.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederr.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederr.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederr.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederr.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederrEE.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederrEE.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederrEE.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrsetvaluenomodificationallowederrEE.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvaluechanged.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvaluechanged.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvaluechanged.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvaluechanged.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalueremove.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalueremove.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalueremove.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/attrspecifiedvalueremove.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectiongetdata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectiongetdata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectiongetdata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectiongetdata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectionnormalize.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectionnormalize.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectionnormalize.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/cdatasectionnormalize.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatagetdata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatagetdata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatagetdata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatagetdata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataappenddatanomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatabegining.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatabegining.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatabegining.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatabegining.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataend.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataend.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataend.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataend.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataexceedslength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataexceedslength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataexceedslength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedataexceedslength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatagetlengthanddata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatagetlengthanddata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatagetlengthanddata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatagetlengthanddata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatamiddle.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatamiddle.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatamiddle.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatamiddle.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatadeletedatanomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetdata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetdata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetdata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetdata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetlength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetlength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetlength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatagetlength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedatacountnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedatacountnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedatacountnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedatacountnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrdeletedataoffsetnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrinsertdataoffsetnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedatacountnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedatacountnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedatacountnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedatacountnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrreplacedataoffsetnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringcountnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringcountnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringcountnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringcountnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringnegativeoffset.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringnegativeoffset.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringnegativeoffset.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringnegativeoffset.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdataindexsizeerrsubstringoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatabeginning.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatabeginning.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatabeginning.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatabeginning.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdataend.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdataend.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdataend.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdataend.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatamiddle.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatamiddle.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatamiddle.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatamiddle.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatainsertdatanomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatabegining.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatabegining.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatabegining.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatabegining.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataend.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataend.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataend.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataend.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofarg.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofarg.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofarg.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofarg.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofdata.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofdata.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofdata.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedataexceedslengthofdata.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatamiddle.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatamiddle.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatamiddle.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatamiddle.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatareplacedatanomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetdatanomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasetnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringexceedsvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringexceedsvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringexceedsvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringexceedsvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/characterdatasubstringvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/commentgetcomment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/commentgetcomment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/commentgetcomment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/commentgetcomment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecdatasection.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecdatasection.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecdatasection.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecdatasection.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecomment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecomment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecomment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatecomment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelement.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelement.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelement.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelement.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementcasesensitive.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementcasesensitive.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementcasesensitive.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementcasesensitive.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementdefaultattr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementdefaultattr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementdefaultattr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateelementdefaultattr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreference.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreference.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreference.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreference.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreferenceknown.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreferenceknown.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreferenceknown.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateentityreferenceknown.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateprocessinginstruction.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateprocessinginstruction.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateprocessinginstruction.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreateprocessinginstruction.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatetextnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatetextnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatetextnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentcreatetextnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctypenodtd.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctypenodtd.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctypenodtd.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetdoctypenodtd.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamelength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamelength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamelength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamelength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnametotallength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnametotallength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnametotallength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnametotallength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetelementsbytagnamevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetimplementation.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetimplementation.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetimplementation.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetimplementation.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetrootnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetrootnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetrootnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentgetrootnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateelement.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateelement.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateelement.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateelement.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreateentref1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documentinvalidcharacterexceptioncreatepi1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetdoctype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetdoctype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetdoctype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetdoctype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentities.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentities.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentities.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentities.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitieslength.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitieslength.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitieslength.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitieslength.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitiestype.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitiestype.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitiestype.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetentitiestype.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotations.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotations.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotations.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotations.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotationstype.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotationstype.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotationstype.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/documenttypegetnotationstype.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenoversion.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenoversion.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenoversion.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenoversion.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenull.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenull.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenull.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturenull.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturexml.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturexml.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturexml.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/domimplementationfeaturexml.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementaddnewattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementaddnewattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementaddnewattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementaddnewattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementassociatedattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementassociatedattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementassociatedattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementassociatedattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementchangeattributevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementchangeattributevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementchangeattributevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementchangeattributevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementcreatenewattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementcreatenewattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementcreatenewattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementcreatenewattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetattributenodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementempty.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementempty.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementempty.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementempty.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnameaccessnodelist.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnameaccessnodelist.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnameaccessnodelist.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnameaccessnodelist.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamenomatch.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamenomatch.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamenomatch.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamenomatch.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamespecialvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamespecialvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamespecialvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgetelementsbytagnamespecialvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgettagname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgettagname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementgettagname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementgettagname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementinuseattributeerr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementinuseattributeerr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementinuseattributeerr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementinuseattributeerr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementinvalidcharacterexception.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementinvalidcharacterexception.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementinvalidcharacterexception.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementinvalidcharacterexception.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementnormalize.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementnormalize.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementnormalize.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementnormalize.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementnotfounderr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementnotfounderr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementnotfounderr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementnotfounderr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattribute.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattribute.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattribute.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattribute.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributeaftercreate.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributeaftercreate.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributeaftercreate.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributeaftercreate.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenodenomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributenomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributerestoredefaultvalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributerestoredefaultvalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributerestoredefaultvalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementremoveattributerestoredefaultvalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceattributewithself.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceattributewithself.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceattributewithself.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceattributewithself.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattributegevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattributegevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattributegevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementreplaceexistingattributegevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveallattributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveallattributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveallattributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveallattributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveattrvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveattrvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveattrvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrieveattrvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrievetagname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrievetagname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrievetagname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementretrievetagname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementsetattributenomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementwrongdocumenterr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementwrongdocumenterr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/elementwrongdocumenterr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/elementwrongdocumenterr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetentityname.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetentityname.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetentityname.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetentityname.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicid.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicid.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicid.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicid.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicidnull.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicidnull.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicidnull.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/entitygetpublicidnull.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_nodtdstaff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/hc_staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgtest.js b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgtest.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgtest.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgtest.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgunit.js b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgunit.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgunit.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/svgunit.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/xhtml1-strict.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/xhtml1-strict.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/files/xhtml1-strict.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/files/xhtml1-strict.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrappendchild6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrchildnodes2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrclonenode1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrclonenode1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrclonenode1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrclonenode1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatedocumentfragment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatedocumentfragment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatedocumentfragment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatedocumentfragment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrcreatetextnode2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attreffectivevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attreffectivevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attreffectivevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attreffectivevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrfirstchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrfirstchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrfirstchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrfirstchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue2.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue2.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue2.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrgetvalue2.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrhaschildnodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrhaschildnodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrhaschildnodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrhaschildnodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore7.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore7.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore7.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrinsertbefore7.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrlastchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrlastchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrlastchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrlastchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnextsiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnextsiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnextsiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnextsiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnormalize.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnormalize.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnormalize.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrnormalize.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrparentnodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrparentnodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrparentnodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrparentnodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrprevioussiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrprevioussiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrprevioussiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrprevioussiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrremovechild2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrreplacechild2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrsetvalue2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvaluechanged.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvaluechanged.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvaluechanged.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_attrspecifiedvaluechanged.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddatagetdata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddatagetdata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddatagetdata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataappenddatagetdata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatabegining.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatabegining.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatabegining.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatabegining.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataend.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataend.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataend.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataend.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataexceedslength.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataexceedslength.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataexceedslength.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedataexceedslength.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatagetlengthanddata.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatagetlengthanddata.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatagetlengthanddata.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatagetlengthanddata.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatamiddle.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatamiddle.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatamiddle.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatadeletedatamiddle.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetdata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetdata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetdata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetdata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetlength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetlength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetlength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatagetlength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedatacountnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedatacountnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedatacountnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedatacountnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrdeletedataoffsetnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrinsertdataoffsetnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedatacountnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedatacountnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedatacountnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedatacountnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrreplacedataoffsetnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringcountnegative.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringcountnegative.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringcountnegative.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringcountnegative.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringnegativeoffset.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringnegativeoffset.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringnegativeoffset.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringnegativeoffset.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringoffsetgreater.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringoffsetgreater.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringoffsetgreater.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdataindexsizeerrsubstringoffsetgreater.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatabeginning.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatabeginning.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatabeginning.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatabeginning.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdataend.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdataend.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdataend.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdataend.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatamiddle.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatamiddle.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatamiddle.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatainsertdatamiddle.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatabegining.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatabegining.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatabegining.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatabegining.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataend.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataend.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataend.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataend.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofarg.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofarg.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofarg.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofarg.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofdata.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofdata.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofdata.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedataexceedslengthofdata.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatamiddle.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatamiddle.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatamiddle.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatareplacedatamiddle.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasetnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasetnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasetnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasetnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringexceedsvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringexceedsvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringexceedsvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringexceedsvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_characterdatasubstringvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_commentgetcomment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_commentgetcomment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_commentgetcomment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_commentgetcomment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatecomment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatecomment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatecomment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatecomment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelement.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelement.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelement.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelement.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelementcasesensitive.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelementcasesensitive.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelementcasesensitive.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreateelementcasesensitive.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatetextnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatetextnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatetextnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentcreatetextnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetdoctype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetdoctype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetdoctype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetdoctype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamelength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamelength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamelength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamelength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnametotallength.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnametotallength.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnametotallength.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnametotallength.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetelementsbytagnamevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetimplementation.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetimplementation.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetimplementation.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetimplementation.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetrootnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetrootnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetrootnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentgetrootnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute.xml.not-for-html5 b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute.xml.not-for-html5
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute.xml.not-for-html5
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute.xml.not-for-html5
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute1.xml.not-for-html5 b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute1.xml.not-for-html5
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute1.xml.not-for-html5
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateattribute1.xml.not-for-html5
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement.xml.not-for-html5 b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement.xml.not-for-html5
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement.xml.not-for-html5
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement.xml.not-for-html5
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement1.xml.not-for-html5 b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement1.xml.not-for-html5
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement1.xml.not-for-html5
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_documentinvalidcharacterexceptioncreateelement1.xml.not-for-html5
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenoversion.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenoversion.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenoversion.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenoversion.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenull.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenull.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenull.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturenull.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturexml.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturexml.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturexml.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_domimplementationfeaturexml.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementaddnewattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementaddnewattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementaddnewattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementaddnewattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementassociatedattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementassociatedattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementassociatedattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementassociatedattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementchangeattributevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementchangeattributevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementchangeattributevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementchangeattributevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementcreatenewattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementcreatenewattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementcreatenewattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementcreatenewattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetattributenodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementempty.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementempty.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementempty.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementempty.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnameaccessnodelist.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnameaccessnodelist.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnameaccessnodelist.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnameaccessnodelist.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamenomatch.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamenomatch.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamenomatch.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamenomatch.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamespecialvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamespecialvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamespecialvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgetelementsbytagnamespecialvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgettagname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgettagname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgettagname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementgettagname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinuseattributeerr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinuseattributeerr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinuseattributeerr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinuseattributeerr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementinvalidcharacterexception1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize2.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize2.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize2.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnormalize2.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnotfounderr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnotfounderr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnotfounderr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementnotfounderr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributeaftercreate.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributeaftercreate.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributeaftercreate.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributeaftercreate.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributenode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributenode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributenode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementremoveattributenode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceattributewithself.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceattributewithself.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceattributewithself.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceattributewithself.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattributegevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattributegevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattributegevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementreplaceexistingattributegevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveallattributes.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveallattributes.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveallattributes.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveallattributes.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveattrvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveattrvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveattrvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrieveattrvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrievetagname.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrievetagname.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrievetagname.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementretrievetagname.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementsetattributenodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementsetattributenodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementsetattributenodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementsetattributenodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementwrongdocumenterr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementwrongdocumenterr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementwrongdocumenterr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_elementwrongdocumenterr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiesremovenameditem1.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiesremovenameditem1.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiesremovenameditem1.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiesremovenameditem1.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiessetnameditem1.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiessetnameditem1.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiessetnameditem1.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_entitiessetnameditem1.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapchildnoderange.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapchildnoderange.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapchildnoderange.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapchildnoderange.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapgetnameditem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapgetnameditem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapgetnameditem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapgetnameditem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapinuseattributeerr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapinuseattributeerr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapinuseattributeerr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapinuseattributeerr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnotfounderr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnotfounderr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnotfounderr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnotfounderr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnumberofnodes.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnumberofnodes.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnumberofnodes.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapnumberofnodes.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapremovenameditem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapremovenameditem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapremovenameditem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapremovenameditem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnattrnode.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnattrnode.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnattrnode.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnattrnode.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnfirstitem.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnfirstitem.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnfirstitem.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnfirstitem.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnlastitem.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnlastitem.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnlastitem.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnlastitem.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapreturnnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemreturnvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemreturnvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemreturnvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemreturnvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemthatexists.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemthatexists.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemthatexists.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemthatexists.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemwithnewvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemwithnewvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemwithnewvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapsetnameditemwithnewvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapwrongdocumenterr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapwrongdocumenterr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapwrongdocumenterr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_namednodemapwrongdocumenterr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildchildexists.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildchildexists.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildchildexists.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildchildexists.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchilddocfragment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchilddocfragment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchilddocfragment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchilddocfragment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildgetnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildgetnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildgetnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildgetnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildinvalidnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildinvalidnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildinvalidnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildinvalidnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnewchilddiffdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnewchilddiffdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnewchilddiffdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnewchilddiffdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnodeancestor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnodeancestor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnodeancestor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeappendchildnodeancestor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeattributenodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesappendchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesappendchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesappendchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesappendchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecloneattributescopied.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecloneattributescopied.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecloneattributescopied.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecloneattributescopied.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonefalsenocopytext.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonefalsenocopytext.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonefalsenocopytext.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonefalsenocopytext.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonegetparentnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonegetparentnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonegetparentnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonegetparentnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodetrue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodetrue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodetrue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonenodetrue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonetruecopytext.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonetruecopytext.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonetruecopytext.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeclonetruecopytext.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodeattributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodeattributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodeattributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodeattributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodecommentnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentfragmentnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodedocumentnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodeattributes.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodeattributes.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodeattributes.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodeattributes.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeelementnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchildnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchildnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchildnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetfirstchildnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchildnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchildnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchildnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetlastchildnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsibling.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsibling.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsibling.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsibling.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetnextsiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocumentnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocumentnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocumentnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetownerdocumentnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussibling.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussibling.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussibling.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussibling.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodegetprevioussiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodesfalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodesfalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodesfalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodehaschildnodesfalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbefore.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbefore.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbefore.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbefore.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforedocfragment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforedocfragment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforedocfragment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforedocfragment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforeinvalidnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforeinvalidnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforeinvalidnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforeinvalidnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchilddiffdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchilddiffdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchilddiffdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchilddiffdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchildexists.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchildexists.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchildexists.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenewchildexists.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodeancestor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodeancestor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodeancestor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodeancestor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforenodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnonexistent.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnonexistent.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnonexistent.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnonexistent.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeinsertbeforerefchildnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexnotzero.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexnotzero.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexnotzero.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistindexnotzero.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnfirstitem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnfirstitem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnfirstitem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnfirstitem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelisttraverselist.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelisttraverselist.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelisttraverselist.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodelisttraverselist.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodeparentnodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildgetnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildgetnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildgetnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildgetnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildoldchildnonexistent.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildoldchildnonexistent.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildoldchildnonexistent.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_noderemovechildoldchildnonexistent.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildinvalidnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildinvalidnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildinvalidnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildinvalidnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchilddiffdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchilddiffdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchilddiffdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchilddiffdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchildexists.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchildexists.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchildexists.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnewchildexists.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodeancestor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodeancestor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodeancestor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodeancestor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildoldchildnonexistent.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildoldchildnonexistent.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildoldchildnonexistent.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodereplacechildoldchildnonexistent.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodetextnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_nodevalue08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationsremovenameditem1.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationsremovenameditem1.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationsremovenameditem1.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationsremovenameditem1.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationssetnameditem1.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationssetnameditem1.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationssetnameditem1.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_notationssetnameditem1.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerrnegativeoffset.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerrnegativeoffset.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerrnegativeoffset.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerrnegativeoffset.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerroffsetoutofbounds.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerroffsetoutofbounds.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerroffsetoutofbounds.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textindexsizeerroffsetoutofbounds.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextfour.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextfour.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextfour.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextfour.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextone.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextone.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextone.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextone.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextthree.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextthree.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextthree.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittextthree.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittexttwo.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittexttwo.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittexttwo.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textsplittexttwo.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textwithnomarkup.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textwithnomarkup.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textwithnomarkup.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/hc_textwithnomarkup.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapgetnameditem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapgetnameditem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapgetnameditem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapgetnameditem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapinuseattributeerr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapinuseattributeerr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapinuseattributeerr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapinuseattributeerr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnotfounderr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnotfounderr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnotfounderr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnotfounderr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditem.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditem.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditem.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditem.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemgetvalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemgetvalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemgetvalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemgetvalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemreturnnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemreturnnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemreturnnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapremovenameditemreturnnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnattrnode.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnattrnode.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnattrnode.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnattrnode.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnfirstitem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnfirstitem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnfirstitem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnfirstitem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnlastitem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnlastitem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnlastitem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnlastitem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapreturnnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditem.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditem.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditem.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditem.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemreturnvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemreturnvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemreturnvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemreturnvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemthatexists.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemthatexists.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemthatexists.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemthatexists.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemwithnewvalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemwithnewvalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemwithnewvalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapsetnameditemwithnewvalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapwrongdocumenterr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapwrongdocumenterr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapwrongdocumenterr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/namednodemapwrongdocumenterr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildchildexists.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildchildexists.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildchildexists.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildchildexists.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchilddocfragment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchilddocfragment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchilddocfragment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchilddocfragment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildgetnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildgetnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildgetnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildgetnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildinvalidnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildinvalidnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildinvalidnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildinvalidnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnewchilddiffdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnewchilddiffdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnewchilddiffdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnewchilddiffdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnodeancestor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnodeancestor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnodeancestor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnodeancestor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederrEE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederrEE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederrEE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeappendchildnomodificationallowederrEE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeattributenodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecdatasectionnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesempty.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesempty.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesempty.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodechildnodesempty.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecloneattributescopied.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecloneattributescopied.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecloneattributescopied.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecloneattributescopied.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonefalsenocopytext.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonefalsenocopytext.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonefalsenocopytext.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonefalsenocopytext.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonegetparentnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonegetparentnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonegetparentnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonegetparentnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonetruecopytext.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonetruecopytext.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonetruecopytext.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeclonetruecopytext.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodeattributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodeattributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodeattributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodeattributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodecommentnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentfragmentnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumentnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodedocumenttypenodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodeattributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodeattributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodeattributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodeattributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeelementnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodeattributes.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodeattributes.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodeattributes.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodeattributes.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodename.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodename.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodename.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodename.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodetype.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodetype.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodetype.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodetype.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodevalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodevalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodevalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitynodevalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodeattributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodeattributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodeattributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodeattributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentityreferencenodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitysetnodevalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitysetnodevalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitysetnodevalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeentitysetnodevalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchildnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchildnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchildnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetfirstchildnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchildnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchildnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchildnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetlastchildnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsibling.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsibling.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsibling.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsibling.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetnextsiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocumentnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocumentnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocumentnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetownerdocumentnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussibling.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussibling.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussibling.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussibling.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussiblingnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussiblingnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussiblingnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodegetprevioussiblingnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodesfalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodesfalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodesfalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodehaschildnodesfalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforedocfragment.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforedocfragment.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforedocfragment.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforedocfragment.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforeinvalidnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforeinvalidnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforeinvalidnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforeinvalidnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchilddiffdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchilddiffdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchilddiffdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchilddiffdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodeancestor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodeancestor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodeancestor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodeancestor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederrEE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederrEE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederrEE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforenomodificationallowederrEE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnonexistent.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnonexistent.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnonexistent.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnonexistent.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeinsertbeforerefchildnull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexequalzero.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexequalzero.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexequalzero.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexequalzero.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlengthofemptylist.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlengthofemptylist.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlengthofemptylist.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexgetlengthofemptylist.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodeattributes.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodeattributes.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodeattributes.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodeattributes.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodename.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodename.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodename.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodename.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodetype.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodetype.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodetype.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodetype.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodevalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodevalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodevalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodenotationnodevalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnodenull.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnodenull.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnodenull.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeparentnodenull.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodeattributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodeattributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodeattributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodeattributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodename.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodename.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodename.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodename.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodetype.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodetype.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodetype.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodetype.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodevalue.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodevalue.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodevalue.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionnodevalue.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionsetnodevalue.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionsetnodevalue.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionsetnodevalue.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodeprocessinginstructionsetnodevalue.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildnomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildoldchildnonexistent.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildoldchildnonexistent.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildoldchildnonexistent.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/noderemovechildoldchildnonexistent.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechild.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechild.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechild.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechild.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildinvalidnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildinvalidnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildinvalidnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildinvalidnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchilddiffdocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchilddiffdocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchilddiffdocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchilddiffdocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodeancestor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodeancestor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodeancestor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodeancestor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederrEE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederrEE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederrEE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildnomodificationallowederrEE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildoldchildnonexistent.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildoldchildnonexistent.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildoldchildnonexistent.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodereplacechildoldchildnonexistent.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodesetnodevaluenomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodeattribute.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodeattribute.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodeattribute.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodeattribute.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodename.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodename.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodename.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodename.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodetype.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodetype.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodetype.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodetype.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodevalue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodevalue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodevalue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodetextnodevalue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/nodevalue09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetnotationname.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetnotationname.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetnotationname.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetnotationname.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicid.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicid.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicid.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicid.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicidnull.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicidnull.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicidnull.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetpublicidnull.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemid.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemid.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemid.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemid.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemidnull.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemidnull.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemidnull.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/notationgetsystemidnull.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongetdata.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongetdata.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongetdata.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongetdata.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongettarget.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongettarget.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongettarget.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructiongettarget.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederr.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederr.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederr.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederr.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederrEE.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederrEE.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederrEE.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/processinginstructionsetdatanomodificationallowederrEE.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerrnegativeoffset.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerrnegativeoffset.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerrnegativeoffset.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerrnegativeoffset.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerroffsetoutofbounds.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerroffsetoutofbounds.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerroffsetoutofbounds.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textindexsizeerroffsetoutofbounds.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textparseintolistofelements.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textparseintolistofelements.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textparseintolistofelements.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textparseintolistofelements.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextfour.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextfour.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextfour.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextfour.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederr.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederr.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederr.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederr.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederrEE.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederrEE.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederrEE.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextnomodificationallowederrEE.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextone.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextone.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextone.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextone.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextthree.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextthree.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextthree.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittextthree.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittexttwo.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittexttwo.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittexttwo.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textsplittexttwo.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/core/textwithnomarkup.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textwithnomarkup.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/core/textwithnomarkup.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/core/textwithnomarkup.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement06.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement06.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement06.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement06.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement07.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement07.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement07.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement07.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement08.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement08.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement08.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement08.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement09.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement09.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement09.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement09.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement10.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement10.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement10.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement10.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement11.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement11.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement11.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement11.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement12.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement12.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement12.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement12.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement13.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement13.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement13.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement13.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement14.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement14.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement14.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAnchorElement14.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement06.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement06.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement06.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement06.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement07.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement07.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement07.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement07.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement08.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement08.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement08.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement08.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement09.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement09.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement09.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement09.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement10.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement10.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement10.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement10.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement11.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement11.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement11.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAppletElement11.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement06.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement06.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement06.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement06.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement07.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement07.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement07.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement07.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement08.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement08.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement08.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLAreaElement08.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLBodyElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLButtonElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLCollection12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDivElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDivElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDivElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDivElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument08.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument08.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument08.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument08.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement100.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement100.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement100.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement100.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement101.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement101.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement101.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement101.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement102.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement102.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement102.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement102.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement103.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement103.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement103.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement103.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement104.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement104.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement104.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement104.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement105.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement105.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement105.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement105.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement106.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement106.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement106.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement106.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement107.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement107.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement107.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement107.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement108.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement108.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement108.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement108.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement109.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement109.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement109.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement109.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement110.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement110.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement110.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement110.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement111.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement111.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement111.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement111.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement112.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement112.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement112.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement112.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement113.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement113.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement113.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement113.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement114.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement114.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement114.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement114.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement115.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement115.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement115.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement115.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement116.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement116.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement116.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement116.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement117.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement117.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement117.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement117.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement118.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement118.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement118.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement118.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement119.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement119.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement119.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement119.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement120.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement120.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement120.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement120.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement121.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement121.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement121.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement121.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement122.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement122.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement122.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement122.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement123.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement123.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement123.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement123.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement124.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement124.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement124.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement124.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement125.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement125.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement125.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement125.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement126.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement126.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement126.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement126.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement127.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement127.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement127.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement127.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement128.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement128.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement128.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement128.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement129.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement129.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement129.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement129.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement130.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement130.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement130.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement130.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement131.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement131.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement131.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement131.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement132.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement132.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement132.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement132.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement133.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement133.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement133.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement133.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement134.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement134.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement134.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement134.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement135.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement135.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement135.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement135.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement136.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement136.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement136.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement136.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement137.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement137.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement137.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement137.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement138.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement138.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement138.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement138.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement139.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement139.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement139.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement139.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement140.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement140.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement140.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement140.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement141.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement141.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement141.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement141.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement142.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement142.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement142.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement142.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement143.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement143.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement143.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement143.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement144.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement144.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement144.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement144.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement145.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement145.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement145.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement145.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement32.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement32.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement32.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement32.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement33.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement33.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement33.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement33.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement34.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement34.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement34.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement34.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement35.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement35.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement35.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement35.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement36.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement36.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement36.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement36.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement37.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement37.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement37.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement37.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement38.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement38.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement38.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement38.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement39.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement39.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement39.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement39.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement40.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement40.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement40.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement40.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement41.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement41.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement41.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement41.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement42.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement42.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement42.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement42.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement43.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement43.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement43.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement43.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement44.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement44.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement44.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement44.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement45.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement45.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement45.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement45.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement46.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement46.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement46.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement46.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement47.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement47.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement47.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement47.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement48.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement48.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement48.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement48.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement49.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement49.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement49.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement49.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement50.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement50.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement50.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement50.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement51.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement51.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement51.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement51.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement52.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement52.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement52.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement52.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement53.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement53.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement53.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement53.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement54.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement54.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement54.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement54.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement55.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement55.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement55.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement55.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement56.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement56.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement56.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement56.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement57.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement57.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement57.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement57.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement58.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement58.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement58.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement58.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement59.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement59.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement59.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement59.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement60.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement60.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement60.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement60.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement61.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement61.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement61.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement61.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement62.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement62.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement62.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement62.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement63.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement63.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement63.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement63.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement64.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement64.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement64.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement64.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement65.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement65.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement65.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement65.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement66.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement66.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement66.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement66.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement67.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement67.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement67.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement67.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement68.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement68.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement68.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement68.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement69.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement69.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement69.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement69.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement70.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement70.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement70.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement70.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement71.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement71.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement71.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement71.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement72.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement72.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement72.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement72.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement73.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement73.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement73.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement73.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement74.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement74.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement74.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement74.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement75.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement75.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement75.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement75.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement76.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement76.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement76.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement76.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement77.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement77.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement77.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement77.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement78.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement78.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement78.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement78.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement79.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement79.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement79.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement79.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement80.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement80.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement80.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement80.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement81.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement81.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement81.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement81.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement82.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement82.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement82.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement82.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement83.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement83.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement83.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement83.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement84.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement84.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement84.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement84.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement85.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement85.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement85.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement85.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement86.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement86.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement86.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement86.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement87.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement87.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement87.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement87.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement88.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement88.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement88.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement88.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement89.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement89.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement89.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement89.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement90.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement90.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement90.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement90.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement91.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement91.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement91.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement91.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement92.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement92.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement92.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement92.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement93.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement93.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement93.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement93.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement94.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement94.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement94.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement94.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement95.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement95.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement95.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement95.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement96.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement96.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement96.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement96.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement97.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement97.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement97.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement97.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement98.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement98.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement98.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement98.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement99.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement99.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement99.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLElement99.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFieldSetElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFontElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFormElement10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHeadingElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHtmlElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHtmlElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHtmlElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLHtmlElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLImageElement14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLInputElement22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLIsIndexElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLIElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLabelElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLegendElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLLinkElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMapElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLMetaElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement16.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement16.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement16.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement16.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptGroupElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLOptionElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParagraphElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParagraphElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParagraphElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParagraphElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLPreElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLQuoteElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLScriptElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCaptionElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCaptionElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCaptionElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCaptionElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement15.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement15.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement15.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement15.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement16.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement16.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement16.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement16.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement17.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement17.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement17.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement17.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement18.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement18.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement18.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement18.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement19.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement19.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement19.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement19.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement20.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement20.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement20.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement20.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement21.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement21.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement21.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement21.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement22.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement22.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement22.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement22.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement23.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement23.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement23.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement23.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement24.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement24.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement24.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement24.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement25.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement25.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement25.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement25.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement26.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement26.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement26.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement26.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement27.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement27.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement27.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement27.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement28.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement28.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement28.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement28.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement29.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement29.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement29.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement29.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement30.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement30.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement30.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableCellElement30.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableColElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement15.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement15.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement15.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement15.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement16.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement16.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement16.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement16.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement17.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement17.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement17.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement17.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement18.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement18.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement18.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement18.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement19.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement19.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement19.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement19.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement22.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement22.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement22.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement22.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement26.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement26.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement26.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement26.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTextAreaElement15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTitleElement01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTitleElement01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTitleElement01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLTitleElement01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/HTMLUListElement02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor06.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor06.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/anchor06.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/anchor06.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/area01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/area01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/area02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/area02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/area03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/area03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/area04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/area04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/area04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/basefont01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/basefont01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/basefont01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/basefont01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/body01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/body01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/body01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/body01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button02.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button02.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button02.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button02.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button03.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button03.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button03.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button03.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button04.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button04.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button04.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button04.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button05.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button05.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button05.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button05.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button06.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button06.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button06.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button06.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button07.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button07.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button07.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button07.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button08.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button08.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button08.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button08.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/button09.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button09.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/button09.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/button09.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/dlist01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/dlist01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/dlist01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/dlist01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/doc01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/doc01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/doc01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/doc01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/anchor2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/applet2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/area2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/base2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/basefont.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/body.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/br.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/button.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/collection.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/directory.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/div.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/dl.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/document.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/element.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/fieldset.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/font.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/form3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frame.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/frameset.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/head.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/heading.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/hr.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/html.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/iframe.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/img.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/input.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/isindex.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/label.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/legend.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/li.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/link2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/map.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/menu.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/meta.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/mod.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/object2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/olist.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/optgroup.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/option.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/paragraph.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/param.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/pre.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/quote.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/right.png b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/right.png
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/right.png
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/right.png
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/script.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/select.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/style.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/table1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecaption.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecell.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablecol.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablerow.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/tablesection.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/textarea.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/title.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.html b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/ulist.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/w3c_main.png b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/w3c_main.png
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/files/w3c_main.png
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/files/w3c_main.png
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/hasFeature01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/hasFeature01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/hasFeature01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/hasFeature01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/index.htm b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/index.htm
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/index.htm
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/index.htm
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object05.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object05.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object05.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object05.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object11.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object11.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object11.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object11.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object13.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object13.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object13.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object13.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object14.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object14.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object14.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object14.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/object15.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object15.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/object15.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/object15.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table02.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table02.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table02.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table02.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table06.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table06.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table06.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table06.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table07.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table07.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table07.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table07.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table08.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table08.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table08.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table08.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table09.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table09.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table09.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table09.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table10.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table10.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table10.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table10.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table12.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table12.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table12.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table12.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table15.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table15.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table15.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table15.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table17.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table17.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table17.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table17.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table18.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table18.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table18.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table18.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table19.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table19.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table19.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table19.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table20.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table20.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table20.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table20.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table21.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table21.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table21.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table21.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table22.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table22.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table22.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table22.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table23.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table23.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table23.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table23.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table24.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table24.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table24.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table24.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table25.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table25.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table25.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table25.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table26.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table26.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table26.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table26.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table27.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table27.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table27.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table27.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table28.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table28.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table28.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table28.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table29.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table29.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table29.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table29.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table30.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table30.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table30.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table30.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table31.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table31.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table31.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table31.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table32.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table32.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table32.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table32.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table33.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table33.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table33.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table33.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table34.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table34.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table34.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table34.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table35.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table35.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table35.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table35.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table36.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table36.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table36.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table36.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table37.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table37.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table37.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table37.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table38.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table38.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table38.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table38.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table39.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table39.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table39.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table39.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table40.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table40.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table40.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table40.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table41.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table41.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table41.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table41.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table42.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table42.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table42.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table42.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table43.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table43.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table43.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table43.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table44.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table44.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table44.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table44.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table45.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table45.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table45.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table45.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table46.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table46.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table46.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table46.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table47.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table47.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table47.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table47.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table48.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table48.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table48.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table48.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table49.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table49.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table49.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table49.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table50.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table50.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table50.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table50.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table51.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table51.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table51.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table51.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table52.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table52.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table52.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table52.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level1/html/table53.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table53.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level1/html/table53.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level1/html/table53.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/alltests.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/alltests.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/alltests.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/alltests.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/attrgetownerelement05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createAttributeNS06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocument08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createDocumentType04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/createElementNS06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateattributeNS07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentcreateelementNS06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementbyid01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementbyid01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementbyid01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementbyid01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS01.xml.notimpl b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS01.xml.notimpl
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS01.xml.notimpl
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS01.xml.notimpl
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS03.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS03.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS03.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS03.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS04.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS04.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS04.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS04.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentgetelementsbytagnameNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode11.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode11.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode11.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode11.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode12.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode12.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode12.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode12.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode13.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode13.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode13.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode13.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode14.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode14.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode14.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode14.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode15.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode15.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode15.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode15.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode17.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode17.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode17.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode17.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode18.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode18.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode18.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode18.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode19.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode19.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode19.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode19.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode20.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode20.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode20.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode20.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode21.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode21.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode21.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode21.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode22.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode22.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode22.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documentimportnode22.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypeinternalSubset01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypeinternalSubset01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypeinternalSubset01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypeinternalSubset01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypepublicid01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypepublicid01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypepublicid01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypepublicid01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypesystemid01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypesystemid01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypesystemid01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/documenttypesystemid01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocument07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationcreatedocumenttype04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturecore.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturecore.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturecore.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturecore.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturexmlversion2.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturexmlversion2.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturexmlversion2.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationfeaturexmlversion2.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/domimplementationhasfeature02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributenodens03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributens02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributens02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributens02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetattributens02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementgetelementsbytagnamens05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattribute04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementhasattributens03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementremoveattributens01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementremoveattributens01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementremoveattributens01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementremoveattributens01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributenodens06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributens08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributensurinull.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributensurinull.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributensurinull.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/elementsetattributensurinull.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.html b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/hc_staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/internalSubset01.js b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/internalSubset01.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/internalSubset01.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/internalSubset01.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/nodtdstaff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staff2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/staffNS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgtest.js b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgtest.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgtest.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgtest.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgunit.js b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgunit.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgunit.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/svgunit.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/xhtml1-strict.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/xhtml1-strict.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/files/xhtml1-strict.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/files/xhtml1-strict.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getAttributeNodeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById01.xml.kfail b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById01.xml.kfail
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById01.xml.kfail
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById01.xml.kfail
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementById02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS11.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS11.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS11.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS11.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS12.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS12.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS12.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS12.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS13.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS13.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS13.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS13.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS14.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS14.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS14.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getElementsByTagNameNS14.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/getNamedItemNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttribute04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributeNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hasAttributes02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiesremovenameditemns1.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiesremovenameditemns1.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiesremovenameditemns1.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiesremovenameditemns1.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiessetnameditemns1.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiessetnameditemns1.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiessetnameditemns1.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_entitiessetnameditemns1.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_namednodemapinvalidtype1.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_namednodemapinvalidtype1.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_namednodemapinvalidtype1.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_namednodemapinvalidtype1.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize1.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize1.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize1.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize1.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize2.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize2.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize2.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_nodedocumentfragmentnormalize2.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationsremovenameditemns1.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationsremovenameditemns1.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationsremovenameditemns1.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationsremovenameditemns1.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationssetnameditemns1.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationssetnameditemns1.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationssetnameditemns1.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/hc_notationssetnameditemns1.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode11.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode11.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode11.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode11.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode12.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode12.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode12.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode12.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode13.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode13.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode13.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode13.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode14.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode14.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode14.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode14.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode15.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode15.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode15.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode15.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode16.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode16.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode16.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode16.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode17.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode17.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/importNode17.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/importNode17.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/internalSubset01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/internalSubset01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/internalSubset01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/internalSubset01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported11.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported11.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported11.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported11.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported12.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported12.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported12.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported12.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported13.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported13.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported13.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported13.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported14.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported14.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported14.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/isSupported14.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/localName04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/localName04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/metadata.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/metadata.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/metadata.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/metadata.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapgetnameditemns06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapremovenameditemns09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns11.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns11.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns11.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namednodemapsetnameditemns11.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/namespaceURI04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetlocalname03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetlocalname03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetlocalname03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetlocalname03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetnamespaceuri03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetnamespaceuri03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetnamespaceuri03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetnamespaceuri03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetownerdocument02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetprefix03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetprefix03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetprefix03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodegetprefix03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodehasattributes04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodeissupported05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodenormalize01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodenormalize01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodenormalize01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodenormalize01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/nodesetprefix09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/normalize01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/normalize01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/normalize01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/normalize01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/ownerDocument01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/ownerDocument01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/ownerDocument01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/ownerDocument01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/ownerElement02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix08.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix08.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix08.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix08.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix11.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix11.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/prefix11.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/prefix11.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/publicId01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/publicId01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/publicId01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/publicId01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeAttributeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/removeNamedItemNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS06.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS06.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS06.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS06.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS07.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS07.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS07.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS07.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS09.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS09.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS09.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS09.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS10.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS10.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS10.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNS10.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setAttributeNodeNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS02.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS02.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS02.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS02.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS03.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS03.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS03.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS03.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS04.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS04.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS04.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS04.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS05.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS05.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS05.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/setNamedItemNS05.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/core/systemId01.xml.unknown b/contrib/network/netsurf/libdom/test/testcases/tests/level2/core/systemId01.xml.unknown
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/core/systemId01.xml.unknown
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/core/systemId01.xml.unknown
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/DocumentEventCast01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/DocumentEventCast01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/DocumentEventCast01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/DocumentEventCast01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/EventTargetCast01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/EventTargetCast01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/EventTargetCast01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/EventTargetCast01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/createEvent05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/dispatchEvent13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.html b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/hc_staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/staff.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/staff.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/staff.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/staff.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgtest.js b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgtest.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgtest.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgtest.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgunit.js b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgunit.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgunit.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/svgunit.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/xhtml1-strict.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/xhtml1-strict.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/files/xhtml1-strict.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/files/xhtml1-strict.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/initEvent06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/events/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/events/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/events/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/events/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLAppletElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBaseFontElement03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBaseFontElement03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBaseFontElement03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBaseFontElement03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLBodyElement12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLDocument27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLFrameElement09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLFrameElement09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLFrameElement09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLFrameElement09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLIFrameElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLIFrameElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLIFrameElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLIFrameElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLImageElement12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLInputElement13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLInputElement13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLInputElement13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLInputElement13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLObjectElement20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLSelectElement20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLSelectElement20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLSelectElement20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLSelectElement20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement34.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement34.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement34.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement34.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement35.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement35.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement35.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement35.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement36.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement36.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement36.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement36.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement37.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement37.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement37.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement37.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement38.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement38.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement38.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement38.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement39.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement39.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement39.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement39.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement40.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement40.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement40.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableElement40.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableRowElement21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/frame2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.html b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/iframe2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.html b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/files/optionscollection.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/hasFeature06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/object08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/object08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/object08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/object08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level2/html/object13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level2/html/object13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level2/html/object13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level2/html/object13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrgetschematypeinfo08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/attrisid07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/canonicalform12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/cdatasections01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/cdatasections01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/cdatasections01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/cdatasections01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/checkcharacternormalization03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/comments01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/comments01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/comments01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/comments01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/datatypenormalization18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode32.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode32.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode32.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode32.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode33.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode33.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode33.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode33.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode34.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode34.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode34.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode34.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode35.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode35.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode35.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode35.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode36.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode36.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode36.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentadoptnode36.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdoctype01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdoctype01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdoctype01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdoctype01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetdocumenturi03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetinputencoding04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetstricterrorchecking02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlencoding05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlstandalone05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentgetxmlversion03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentnormalizedocument13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentrenamenode29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetdocumenturi03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetstricterrorchecking03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlstandalone02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/documentsetxmlversion05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcanonicalform1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcanonicalform1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcanonicalform1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcanonicalform1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcdatasections1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcdatasections1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcdatasections1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcdatasections1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcheckcharacternormalization1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcheckcharacternormalization1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcheckcharacternormalization1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcheckcharacternormalization1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcomments1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcomments1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcomments1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigcomments1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigdatatypenormalization2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigelementcontentwhitespace1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigelementcontentwhitespace1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigelementcontentwhitespace1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigelementcontentwhitespace1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigentities1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigentities1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigentities1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigentities1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigerrorhandler2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfiginfoset1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfiginfoset1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfiginfoset1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfiginfoset1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespacedeclarations1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespacedeclarations1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespacedeclarations1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespacedeclarations1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignamespaces2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignormalizecharacters1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignormalizecharacters1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignormalizecharacters1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfignormalizecharacters1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigparameternames01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigparameternames01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigparameternames01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigparameternames01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschemalocation1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschemalocation1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschemalocation1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschemalocation1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschematype1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschematype1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschematype1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigschematype1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigsplitcdatasections1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigsplitcdatasections1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigsplitcdatasections1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigsplitcdatasections1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationcansetparameter06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigurationgetparameter02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidate1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidate1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidate1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidate1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidateifschema1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidateifschema1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidateifschema1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigvalidateifschema1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigwellformed1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigwellformed1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigwellformed1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domconfigwellformed1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationgetfeature06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domimplementationregistry25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistcontains02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistgetlength01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistgetlength01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistgetlength01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistgetlength01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/domstringlistitem02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementcontentwhitespace03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementgetschematypeinfo07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattribute11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributenode10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/elementsetidattributens14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entities04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entities04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetinputencoding04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlencoding04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/entitygetxmlversion04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/Yes b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/Yes
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/Yes
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/Yes
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_base.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_nodefaultns.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_no.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_standalone_yes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/barfoo_utf8.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/canonicalform05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.svg.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.svg.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/datatype_normalization2.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_barfoo.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foo.ent b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foo.ent
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foo.ent
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foo.ent
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foobr.ent b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foobr.ent
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foobr.ent
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_foobr.ent
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_widget.ent b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_widget.ent
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_widget.ent
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/external_widget.ent
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.html b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.html
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.html
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.html
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_nodtdstaff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.svg.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/hc_staff.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgtest.js b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgtest.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgtest.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgtest.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgunit.js b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgunit.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgunit.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/svgunit.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.svg.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/typeinfo.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/xhtml1-strict.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/xhtml1-strict.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/files/xhtml1-strict.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/files/xhtml1-strict.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/handleerror02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/hasFeature04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/infoset09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/infoset09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/namespacedeclarations02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeappendchild02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition32.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition32.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition32.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition32.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition33.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition33.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition33.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition33.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition34.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition34.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition34.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition34.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition35.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition35.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition35.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition35.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition36.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition36.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition36.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition36.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition37.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition37.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition37.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition37.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition38.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition38.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition38.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition38.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition39.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition39.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition39.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition39.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition40.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition40.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition40.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodecomparedocumentposition40.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetbaseuri20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetfeature13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegettextcontent19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodegetuserdata07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeinsertbefore25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisdefaultnamespace16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode32.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode32.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode32.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeisequalnode32.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodeissamenode10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupnamespaceuri20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodelookupprefix20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/noderemovechild31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild32.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild32.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild32.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild32.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild33.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild33.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild33.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild33.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild34.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild34.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild34.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild34.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild35.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild35.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild35.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild35.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild36.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild36.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild36.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild36.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild37.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild37.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild37.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild37.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild38.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild38.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild38.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild38.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild39.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild39.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild39.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild39.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild40.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild40.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild40.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodereplacechild40.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesettextcontent13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/nodesetuserdata10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/normalizecharacters08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/splitcdatasections01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/splitcdatasections01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/splitcdatasections01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/splitcdatasections01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textiselementcontentwhitespace06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textreplacewholetext08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/textwholetext03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypename04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfogettypenamespace04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom18.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom18.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom18.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom18.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom19.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom19.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom19.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom19.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom20.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom20.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom20.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom20.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom21.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom21.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom21.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom21.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom22.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom22.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom22.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom22.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom23.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom23.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom23.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom23.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom24.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom24.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom24.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom24.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom25.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom25.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom25.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom25.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom26.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom26.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom26.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom26.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom27.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom27.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom27.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom27.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom28.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom28.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom28.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom28.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom29.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom29.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom29.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom29.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom30.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom30.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom30.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom30.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom31.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom31.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom31.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom31.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom32.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom32.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom32.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom32.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom33.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom33.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom33.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom33.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom34.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom34.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom34.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom34.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom35.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom35.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom35.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom35.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom36.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom36.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom36.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom36.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom37.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom37.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom37.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom37.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom38.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom38.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom38.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom38.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom39.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom39.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom39.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom39.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom40.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom40.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom40.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom40.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom41.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom41.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom41.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom41.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom42.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom42.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom42.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom42.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom43.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom43.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom43.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom43.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom44.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom44.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom44.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom44.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom45.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom45.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom45.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom45.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom46.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom46.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom46.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom46.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom47.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom47.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom47.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom47.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom48.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom48.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom48.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom48.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom49.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom49.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom49.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom49.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom50.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom50.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom50.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom50.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom51.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom51.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom51.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom51.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom52.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom52.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom52.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom52.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom53.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom53.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom53.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom53.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom54.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom54.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom54.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom54.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom55.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom55.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom55.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom55.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom56.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom56.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom56.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom56.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom57.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom57.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom57.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom57.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom58.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom58.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom58.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom58.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom59.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom59.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom59.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom59.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom60.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom60.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom60.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom60.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom61.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom61.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom61.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom61.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom62.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom62.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom62.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom62.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom63.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom63.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom63.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom63.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom64.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom64.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom64.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom64.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom65.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom65.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom65.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom65.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom66.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom66.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom66.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom66.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom67.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom67.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom67.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom67.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom68.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom68.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom68.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom68.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom69.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom69.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom69.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom69.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom70.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom70.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom70.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom70.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom71.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom71.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom71.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom71.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom72.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom72.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom72.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom72.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom73.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom73.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom73.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/typeinfoisderivedfrom73.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/userdatahandler04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/core/wellformed04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/files/staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/hasFeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/hasFeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/hasFeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/hasFeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/events/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/events/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/events/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/events/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CertifiedText1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CertifiedText1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CertifiedText1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CertifiedText1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CharacterStream1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CharacterStream1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/CharacterStream1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/CharacterStream1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderFilterTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest8.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest8.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest8.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMBuilderTest8.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMEntityResolverTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMImplementationLSTest5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMInputSourceTest6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterFilterTest3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/DOMWriterTest6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/GetFeature2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/HasFeature05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig7.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig7.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig7.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig7.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig8.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig8.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig8.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig8.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig9.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig9.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig9.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSParserConfig9.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig6.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig6.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig6.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig6.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig7.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig7.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig7.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig7.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig8.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig8.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig8.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig8.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig9.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig9.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig9.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/LSSerializerConfig9.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/SystemId2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/canonicalform13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/cdatasections04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/checkcharacternormalization04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/comments04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/comments04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization10.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization10.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization10.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization10.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization11.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization11.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization11.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization11.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization12.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization12.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization12.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization12.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization13.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization13.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization13.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization13.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization14.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization14.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization14.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization14.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization15.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization15.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization15.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization15.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization16.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization16.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization16.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization16.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization17.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization17.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization17.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/datatypenormalization17.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/disallowdoctype01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/disallowdoctype01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/disallowdoctype01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/disallowdoctype01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/discarddefaultcontent02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/dom3tests.ent b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/dom3tests.ent
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/dom3tests.ent
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/dom3tests.ent
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/elementcontentwhitespace03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/encoding01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/encoding01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/encoding01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/encoding01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities09.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities09.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/entities09.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/entities09.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/canonicalform03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/characternormalization1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/characternormalization1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/characternormalization1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/characternormalization1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.svg.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.svg.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.svg.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.svg.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/datatype_normalization2.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.svg.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xhtml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xhtml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xhtml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xhtml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/hc_staff.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/namespaces1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/namespaces1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/namespaces1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/namespaces1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/pibase.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/pibase.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/pibase.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/pibase.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/schematype1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/schematype1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/schematype1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/schematype1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/myentity.ent b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/myentity.ent
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/myentity.ent
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/subdir/myentity.ent
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgtest.js b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgtest.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgtest.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgtest.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgunit.js b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgunit.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgunit.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/svgunit.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test0.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test4.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test4.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test4.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test4.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test5.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test5.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test5.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test5.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test7.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test7.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test7.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/test7.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testpdf.pdf b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testpdf.pdf
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testpdf.pdf
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testpdf.pdf
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testsvg.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testsvg.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testsvg.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/testsvg.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/unsupportedencoding1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/unsupportedencoding1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/unsupportedencoding1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/unsupportedencoding1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validate1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validate1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validate1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validate1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validateschema1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validateschema1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validateschema1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/validateschema1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/wellformed3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/xhtml1-strict.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/xhtml1-strict.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/files/xhtml1-strict.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/files/xhtml1-strict.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/infoset08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespacedeclarations02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/namespaces02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/newline01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/newline01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/newline01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/newline01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/newline02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/newline02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/newline02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/newline02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/newline03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/newline03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/newline03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/newline03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/noinputspecified01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/noinputspecified01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/noinputspecified01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/noinputspecified01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/nooutputspecified01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/nooutputspecified01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/nooutputspecified01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/nooutputspecified01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/normalizecharacters04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schemalocation04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/schematype04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/splitcdatasections02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/unsupportedencoding01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/unsupportedencoding01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/unsupportedencoding01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/unsupportedencoding01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate05.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate05.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate05.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate05.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate06.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate06.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate06.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate06.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate07.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate07.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate07.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate07.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate08.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate08.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validate08.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validate08.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/validateifschema04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/wellformed03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI1.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI1.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI1.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI1.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI2.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI2.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI2.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/writeToURI2.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/ls/xmldeclaration02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedAttributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedAttributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedAttributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedAttributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedChildren.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedChildren.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedChildren.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedChildren.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedFirstChildren.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedFirstChildren.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedFirstChildren.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedFirstChildren.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedNextSiblings.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedNextSiblings.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedNextSiblings.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedNextSiblings.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedParents.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedParents.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedParents.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedParents.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedPreviousSiblings.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedPreviousSiblings.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedPreviousSiblings.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/allowedPreviousSiblings.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendChildTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendData.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendData.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendData.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canAppendData.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canDeleteData.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canDeleteData.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canDeleteData.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canDeleteData.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertBeforeTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertData.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertData.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertData.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canInsertData.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeNode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveAttributeTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canRemoveChildTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceChildTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canReplaceDataTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeFalse.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeFalse.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeFalse.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeFalse.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNode.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNode.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNode.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeNode.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeTrue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeTrue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeTrue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetAttributeTrue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetData.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetData.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetData.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/canSetData.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/contentType.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/contentType.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/contentType.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/contentType.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/defaultValue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/defaultValue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/defaultValue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/defaultValue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/definedElements.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/definedElements.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/definedElements.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/definedElements.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/enumeratedValues.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/enumeratedValues.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/enumeratedValues.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/enumeratedValues.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xsd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xsd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xsd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/files/book.xsd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/getFeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature03.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature03.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature03.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature03.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature04.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature04.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature04.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/hasFeature04.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefined.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefined.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefined.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefined.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefinedNS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefinedNS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefinedNS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/isElementDefinedNS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/nodeValidity.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/nodeValidity.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/nodeValidity.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/nodeValidity.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/requiredAttributes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/requiredAttributes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/requiredAttributes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/requiredAttributes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/validation/validateDocument.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/validateDocument.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/validation/validateDocument.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/validation/validateDocument.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/.cvsignore b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/.cvsignore
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/.cvsignore
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/.cvsignore
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes_xmlns.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes_xmlns.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes_xmlns.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Attribute_Nodes_xmlns.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Comment_Nodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Comment_Nodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Comment_Nodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Comment_Nodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_Expressions.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_Expressions.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_Expressions.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_Expressions.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_ID.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_ID.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_ID.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_ID.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_empty.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_empty.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_empty.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_empty.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_null.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_null.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_null.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_hasFeature_null.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_3.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_3.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_3.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_3.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_empty.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_empty.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_empty.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_empty.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_null.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_null.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_null.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Conformance_isSupported_null.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Element_Nodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Element_Nodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Element_Nodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Element_Nodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Processing_Instruction_Nodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Processing_Instruction_Nodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Processing_Instruction_Nodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Processing_Instruction_Nodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Text_Nodes.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Text_Nodes.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/Text_Nodes.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/Text_Nodes.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluatorCast01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluatorCast01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluatorCast01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluatorCast01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_NS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_no_NS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_no_NS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_no_NS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createExpression_no_NS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_all.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_all.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_all.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_all.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_document.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_document.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_document.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_document.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_documentElement.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_documentElement.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_documentElement.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_createNSResolver_documentElement.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_document.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_document.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_document.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_document.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_documentElement.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_documentElement.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_documentElement.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathEvaluator_evaluate_documentElement.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_document.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_document.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_document.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_document.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_documentElement.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_documentElement.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_documentElement.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathExpression_evaluate_documentElement.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_TYPE_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_TYPE_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_TYPE_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_TYPE_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_false.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_false.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_false.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_false.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_true.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_true.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_true.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_booleanValue_true.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_iteratorNext_UNORDERED_NODE_ITERATOR_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_numberValue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_numberValue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_numberValue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_numberValue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_resultType.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_resultType.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_resultType.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_resultType.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_stringValue.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_stringValue.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_stringValue.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/XPathResult_stringValue.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/alltests.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/alltests.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/alltests.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/alltests.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/dom3xpathents.ent b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/dom3xpathents.ent
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/dom3xpathents.ent
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/dom3xpathents.ent
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/internaldtd.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staff.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.dtd b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.dtd
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.dtd
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.dtd
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.svg b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.svg
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.svg
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.svg
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/staffNS.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgtest.js b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgtest.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgtest.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgtest.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgunit.js b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgunit.js
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgunit.js
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/files/svgunit.js
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/metadata.xml b/contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/metadata.xml
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/level3/xpath/metadata.xml
rename to contrib/network/netsurf/libdom/test/testcases/tests/level3/xpath/metadata.xml
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/submittedtests/netscapeHTML/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Entries b/contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Entries
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Entries
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Entries
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Repository b/contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Repository
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Repository
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Repository
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Root b/contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Root
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Root
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Root
diff --git a/programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Template b/contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Template
similarity index 100%
rename from programs/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Template
rename to contrib/network/netsurf/libdom/test/testcases/tests/validation/files/CVS/Template
diff --git a/programs/network/netsurf/libdom/test/testutils/comparators.c b/contrib/network/netsurf/libdom/test/testutils/comparators.c
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/comparators.c
rename to contrib/network/netsurf/libdom/test/testutils/comparators.c
diff --git a/programs/network/netsurf/libdom/test/testutils/comparators.h b/contrib/network/netsurf/libdom/test/testutils/comparators.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/comparators.h
rename to contrib/network/netsurf/libdom/test/testutils/comparators.h
diff --git a/programs/network/netsurf/libdom/test/testutils/domts.h b/contrib/network/netsurf/libdom/test/testutils/domts.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/domts.h
rename to contrib/network/netsurf/libdom/test/testutils/domts.h
diff --git a/programs/network/netsurf/libdom/test/testutils/domtsasserts.c b/contrib/network/netsurf/libdom/test/testutils/domtsasserts.c
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/domtsasserts.c
rename to contrib/network/netsurf/libdom/test/testutils/domtsasserts.c
diff --git a/programs/network/netsurf/libdom/test/testutils/domtsasserts.h b/contrib/network/netsurf/libdom/test/testutils/domtsasserts.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/domtsasserts.h
rename to contrib/network/netsurf/libdom/test/testutils/domtsasserts.h
diff --git a/programs/network/netsurf/libdom/test/testutils/domtscondition.h b/contrib/network/netsurf/libdom/test/testutils/domtscondition.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/domtscondition.h
rename to contrib/network/netsurf/libdom/test/testutils/domtscondition.h
diff --git a/programs/network/netsurf/libdom/test/testutils/foreach.c b/contrib/network/netsurf/libdom/test/testutils/foreach.c
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/foreach.c
rename to contrib/network/netsurf/libdom/test/testutils/foreach.c
diff --git a/programs/network/netsurf/libdom/test/testutils/foreach.h b/contrib/network/netsurf/libdom/test/testutils/foreach.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/foreach.h
rename to contrib/network/netsurf/libdom/test/testutils/foreach.h
diff --git a/programs/network/netsurf/libdom/test/testutils/list.c b/contrib/network/netsurf/libdom/test/testutils/list.c
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/list.c
rename to contrib/network/netsurf/libdom/test/testutils/list.c
diff --git a/programs/network/netsurf/libdom/test/testutils/list.h b/contrib/network/netsurf/libdom/test/testutils/list.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/list.h
rename to contrib/network/netsurf/libdom/test/testutils/list.h
diff --git a/programs/network/netsurf/libdom/test/testutils/load.c b/contrib/network/netsurf/libdom/test/testutils/load.c
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/load.c
rename to contrib/network/netsurf/libdom/test/testutils/load.c
diff --git a/programs/network/netsurf/libdom/test/testutils/utils.c b/contrib/network/netsurf/libdom/test/testutils/utils.c
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/utils.c
rename to contrib/network/netsurf/libdom/test/testutils/utils.c
diff --git a/programs/network/netsurf/libdom/test/testutils/utils.h b/contrib/network/netsurf/libdom/test/testutils/utils.h
similarity index 100%
rename from programs/network/netsurf/libdom/test/testutils/utils.h
rename to contrib/network/netsurf/libdom/test/testutils/utils.h
diff --git a/programs/network/netsurf/libdom/test/transform.pl b/contrib/network/netsurf/libdom/test/transform.pl
similarity index 100%
rename from programs/network/netsurf/libdom/test/transform.pl
rename to contrib/network/netsurf/libdom/test/transform.pl
diff --git a/programs/network/netsurf/libercurl/Makefile b/contrib/network/netsurf/libercurl/Makefile
similarity index 100%
rename from programs/network/netsurf/libercurl/Makefile
rename to contrib/network/netsurf/libercurl/Makefile
diff --git a/programs/network/netsurf/libercurl/curl.c b/contrib/network/netsurf/libercurl/curl.c
similarity index 100%
rename from programs/network/netsurf/libercurl/curl.c
rename to contrib/network/netsurf/libercurl/curl.c
diff --git a/programs/network/netsurf/libercurl/curl.h b/contrib/network/netsurf/libercurl/curl.h
similarity index 100%
rename from programs/network/netsurf/libercurl/curl.h
rename to contrib/network/netsurf/libercurl/curl.h
diff --git a/programs/network/netsurf/libhubbub/.gitignore b/contrib/network/netsurf/libhubbub/.gitignore
similarity index 100%
rename from programs/network/netsurf/libhubbub/.gitignore
rename to contrib/network/netsurf/libhubbub/.gitignore
diff --git a/programs/network/netsurf/libhubbub/COPYING b/contrib/network/netsurf/libhubbub/COPYING
similarity index 100%
rename from programs/network/netsurf/libhubbub/COPYING
rename to contrib/network/netsurf/libhubbub/COPYING
diff --git a/programs/network/netsurf/libhubbub/Makefile b/contrib/network/netsurf/libhubbub/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/Makefile
rename to contrib/network/netsurf/libhubbub/Makefile
diff --git a/programs/network/netsurf/libhubbub/Makefile.config b/contrib/network/netsurf/libhubbub/Makefile.config
similarity index 100%
rename from programs/network/netsurf/libhubbub/Makefile.config
rename to contrib/network/netsurf/libhubbub/Makefile.config
diff --git a/programs/network/netsurf/libhubbub/README b/contrib/network/netsurf/libhubbub/README
similarity index 100%
rename from programs/network/netsurf/libhubbub/README
rename to contrib/network/netsurf/libhubbub/README
diff --git a/programs/network/netsurf/libhubbub/docs/Architecture b/contrib/network/netsurf/libhubbub/docs/Architecture
similarity index 100%
rename from programs/network/netsurf/libhubbub/docs/Architecture
rename to contrib/network/netsurf/libhubbub/docs/Architecture
diff --git a/programs/network/netsurf/libhubbub/docs/Macros b/contrib/network/netsurf/libhubbub/docs/Macros
similarity index 100%
rename from programs/network/netsurf/libhubbub/docs/Macros
rename to contrib/network/netsurf/libhubbub/docs/Macros
diff --git a/programs/network/netsurf/libhubbub/docs/Todo b/contrib/network/netsurf/libhubbub/docs/Todo
similarity index 100%
rename from programs/network/netsurf/libhubbub/docs/Todo
rename to contrib/network/netsurf/libhubbub/docs/Todo
diff --git a/programs/network/netsurf/libhubbub/docs/Treebuilder b/contrib/network/netsurf/libhubbub/docs/Treebuilder
similarity index 100%
rename from programs/network/netsurf/libhubbub/docs/Treebuilder
rename to contrib/network/netsurf/libhubbub/docs/Treebuilder
diff --git a/programs/network/netsurf/libhubbub/docs/Updated b/contrib/network/netsurf/libhubbub/docs/Updated
similarity index 100%
rename from programs/network/netsurf/libhubbub/docs/Updated
rename to contrib/network/netsurf/libhubbub/docs/Updated
diff --git a/programs/network/netsurf/libhubbub/docs/doxygen.conf b/contrib/network/netsurf/libhubbub/docs/doxygen.conf
similarity index 100%
rename from programs/network/netsurf/libhubbub/docs/doxygen.conf
rename to contrib/network/netsurf/libhubbub/docs/doxygen.conf
diff --git a/programs/network/netsurf/libhubbub/examples/libxml.c b/contrib/network/netsurf/libhubbub/examples/libxml.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/examples/libxml.c
rename to contrib/network/netsurf/libhubbub/examples/libxml.c
diff --git a/programs/network/netsurf/libhubbub/examples/makefile b/contrib/network/netsurf/libhubbub/examples/makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/examples/makefile
rename to contrib/network/netsurf/libhubbub/examples/makefile
diff --git a/programs/network/netsurf/libhubbub/include/hubbub/errors.h b/contrib/network/netsurf/libhubbub/include/hubbub/errors.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/include/hubbub/errors.h
rename to contrib/network/netsurf/libhubbub/include/hubbub/errors.h
diff --git a/programs/network/netsurf/libhubbub/include/hubbub/functypes.h b/contrib/network/netsurf/libhubbub/include/hubbub/functypes.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/include/hubbub/functypes.h
rename to contrib/network/netsurf/libhubbub/include/hubbub/functypes.h
diff --git a/programs/network/netsurf/libhubbub/include/hubbub/hubbub.h b/contrib/network/netsurf/libhubbub/include/hubbub/hubbub.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/include/hubbub/hubbub.h
rename to contrib/network/netsurf/libhubbub/include/hubbub/hubbub.h
diff --git a/programs/network/netsurf/libhubbub/include/hubbub/parser.h b/contrib/network/netsurf/libhubbub/include/hubbub/parser.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/include/hubbub/parser.h
rename to contrib/network/netsurf/libhubbub/include/hubbub/parser.h
diff --git a/programs/network/netsurf/libhubbub/include/hubbub/tree.h b/contrib/network/netsurf/libhubbub/include/hubbub/tree.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/include/hubbub/tree.h
rename to contrib/network/netsurf/libhubbub/include/hubbub/tree.h
diff --git a/programs/network/netsurf/libhubbub/include/hubbub/types.h b/contrib/network/netsurf/libhubbub/include/hubbub/types.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/include/hubbub/types.h
rename to contrib/network/netsurf/libhubbub/include/hubbub/types.h
diff --git a/programs/network/netsurf/libhubbub/libhubbub.pc.in b/contrib/network/netsurf/libhubbub/libhubbub.pc.in
similarity index 100%
rename from programs/network/netsurf/libhubbub/libhubbub.pc.in
rename to contrib/network/netsurf/libhubbub/libhubbub.pc.in
diff --git a/programs/network/netsurf/libhubbub/perf/README b/contrib/network/netsurf/libhubbub/perf/README
similarity index 100%
rename from programs/network/netsurf/libhubbub/perf/README
rename to contrib/network/netsurf/libhubbub/perf/README
diff --git a/programs/network/netsurf/libhubbub/perf/html5libtest.py b/contrib/network/netsurf/libhubbub/perf/html5libtest.py
similarity index 100%
rename from programs/network/netsurf/libhubbub/perf/html5libtest.py
rename to contrib/network/netsurf/libhubbub/perf/html5libtest.py
diff --git a/programs/network/netsurf/libhubbub/perf/hubbub.c b/contrib/network/netsurf/libhubbub/perf/hubbub.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/perf/hubbub.c
rename to contrib/network/netsurf/libhubbub/perf/hubbub.c
diff --git a/programs/network/netsurf/libhubbub/perf/libxml2.c b/contrib/network/netsurf/libhubbub/perf/libxml2.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/perf/libxml2.c
rename to contrib/network/netsurf/libhubbub/perf/libxml2.c
diff --git a/programs/network/netsurf/libhubbub/perf/makefile b/contrib/network/netsurf/libhubbub/perf/makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/perf/makefile
rename to contrib/network/netsurf/libhubbub/perf/makefile
diff --git a/programs/network/netsurf/libhubbub/src/Makefile b/contrib/network/netsurf/libhubbub/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/Makefile
rename to contrib/network/netsurf/libhubbub/src/Makefile
diff --git a/programs/network/netsurf/libhubbub/src/charset/Makefile b/contrib/network/netsurf/libhubbub/src/charset/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/charset/Makefile
rename to contrib/network/netsurf/libhubbub/src/charset/Makefile
diff --git a/programs/network/netsurf/libhubbub/src/charset/detect.c b/contrib/network/netsurf/libhubbub/src/charset/detect.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/charset/detect.c
rename to contrib/network/netsurf/libhubbub/src/charset/detect.c
diff --git a/programs/network/netsurf/libhubbub/src/charset/detect.h b/contrib/network/netsurf/libhubbub/src/charset/detect.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/charset/detect.h
rename to contrib/network/netsurf/libhubbub/src/charset/detect.h
diff --git a/programs/network/netsurf/libhubbub/src/parser.c b/contrib/network/netsurf/libhubbub/src/parser.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/parser.c
rename to contrib/network/netsurf/libhubbub/src/parser.c
diff --git a/programs/network/netsurf/libhubbub/src/tokeniser/Makefile b/contrib/network/netsurf/libhubbub/src/tokeniser/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/tokeniser/Makefile
rename to contrib/network/netsurf/libhubbub/src/tokeniser/Makefile
diff --git a/programs/network/netsurf/libhubbub/src/tokeniser/entities.c b/contrib/network/netsurf/libhubbub/src/tokeniser/entities.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/tokeniser/entities.c
rename to contrib/network/netsurf/libhubbub/src/tokeniser/entities.c
diff --git a/programs/network/netsurf/libhubbub/src/tokeniser/entities.h b/contrib/network/netsurf/libhubbub/src/tokeniser/entities.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/tokeniser/entities.h
rename to contrib/network/netsurf/libhubbub/src/tokeniser/entities.h
diff --git a/programs/network/netsurf/libhubbub/src/tokeniser/entities.inc b/contrib/network/netsurf/libhubbub/src/tokeniser/entities.inc
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/tokeniser/entities.inc
rename to contrib/network/netsurf/libhubbub/src/tokeniser/entities.inc
diff --git a/programs/network/netsurf/libhubbub/src/tokeniser/tokeniser.c b/contrib/network/netsurf/libhubbub/src/tokeniser/tokeniser.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/tokeniser/tokeniser.c
rename to contrib/network/netsurf/libhubbub/src/tokeniser/tokeniser.c
diff --git a/programs/network/netsurf/libhubbub/src/tokeniser/tokeniser.h b/contrib/network/netsurf/libhubbub/src/tokeniser/tokeniser.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/tokeniser/tokeniser.h
rename to contrib/network/netsurf/libhubbub/src/tokeniser/tokeniser.h
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/Makefile b/contrib/network/netsurf/libhubbub/src/treebuilder/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/Makefile
rename to contrib/network/netsurf/libhubbub/src/treebuilder/Makefile
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/after_after_body.c b/contrib/network/netsurf/libhubbub/src/treebuilder/after_after_body.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/after_after_body.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/after_after_body.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/after_after_frameset.c b/contrib/network/netsurf/libhubbub/src/treebuilder/after_after_frameset.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/after_after_frameset.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/after_after_frameset.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/after_body.c b/contrib/network/netsurf/libhubbub/src/treebuilder/after_body.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/after_body.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/after_body.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/after_frameset.c b/contrib/network/netsurf/libhubbub/src/treebuilder/after_frameset.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/after_frameset.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/after_frameset.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/after_head.c b/contrib/network/netsurf/libhubbub/src/treebuilder/after_head.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/after_head.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/after_head.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/before_head.c b/contrib/network/netsurf/libhubbub/src/treebuilder/before_head.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/before_head.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/before_head.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/before_html.c b/contrib/network/netsurf/libhubbub/src/treebuilder/before_html.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/before_html.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/before_html.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/generic_rcdata.c b/contrib/network/netsurf/libhubbub/src/treebuilder/generic_rcdata.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/generic_rcdata.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/generic_rcdata.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_body.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_body.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_body.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_body.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_caption.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_caption.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_caption.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_caption.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_cell.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_cell.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_cell.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_cell.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_column_group.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_column_group.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_column_group.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_column_group.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_foreign_content.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_foreign_content.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_foreign_content.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_foreign_content.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_frameset.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_frameset.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_frameset.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_frameset.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_head.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_head.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_head.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_head.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_head_noscript.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_head_noscript.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_head_noscript.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_head_noscript.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_row.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_row.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_row.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_row.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_select.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_select.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_select.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_select.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_select_in_table.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_select_in_table.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_select_in_table.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_select_in_table.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_table.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_table.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_table.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_table.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/in_table_body.c b/contrib/network/netsurf/libhubbub/src/treebuilder/in_table_body.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/in_table_body.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/in_table_body.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/initial.c b/contrib/network/netsurf/libhubbub/src/treebuilder/initial.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/initial.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/initial.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/internal.h b/contrib/network/netsurf/libhubbub/src/treebuilder/internal.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/internal.h
rename to contrib/network/netsurf/libhubbub/src/treebuilder/internal.h
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/modes.h b/contrib/network/netsurf/libhubbub/src/treebuilder/modes.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/modes.h
rename to contrib/network/netsurf/libhubbub/src/treebuilder/modes.h
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/treebuilder.c b/contrib/network/netsurf/libhubbub/src/treebuilder/treebuilder.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/treebuilder.c
rename to contrib/network/netsurf/libhubbub/src/treebuilder/treebuilder.c
diff --git a/programs/network/netsurf/libhubbub/src/treebuilder/treebuilder.h b/contrib/network/netsurf/libhubbub/src/treebuilder/treebuilder.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/treebuilder/treebuilder.h
rename to contrib/network/netsurf/libhubbub/src/treebuilder/treebuilder.h
diff --git a/programs/network/netsurf/libhubbub/src/utils/Makefile b/contrib/network/netsurf/libhubbub/src/utils/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/utils/Makefile
rename to contrib/network/netsurf/libhubbub/src/utils/Makefile
diff --git a/programs/network/netsurf/libhubbub/src/utils/errors.c b/contrib/network/netsurf/libhubbub/src/utils/errors.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/utils/errors.c
rename to contrib/network/netsurf/libhubbub/src/utils/errors.c
diff --git a/programs/network/netsurf/libhubbub/src/utils/parserutilserror.h b/contrib/network/netsurf/libhubbub/src/utils/parserutilserror.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/utils/parserutilserror.h
rename to contrib/network/netsurf/libhubbub/src/utils/parserutilserror.h
diff --git a/programs/network/netsurf/libhubbub/src/utils/string.c b/contrib/network/netsurf/libhubbub/src/utils/string.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/utils/string.c
rename to contrib/network/netsurf/libhubbub/src/utils/string.c
diff --git a/programs/network/netsurf/libhubbub/src/utils/string.h b/contrib/network/netsurf/libhubbub/src/utils/string.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/utils/string.h
rename to contrib/network/netsurf/libhubbub/src/utils/string.h
diff --git a/programs/network/netsurf/libhubbub/src/utils/utils.h b/contrib/network/netsurf/libhubbub/src/utils/utils.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/src/utils/utils.h
rename to contrib/network/netsurf/libhubbub/src/utils/utils.h
diff --git a/programs/network/netsurf/libhubbub/test/INDEX b/contrib/network/netsurf/libhubbub/test/INDEX
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/INDEX
rename to contrib/network/netsurf/libhubbub/test/INDEX
diff --git a/programs/network/netsurf/libhubbub/test/Makefile b/contrib/network/netsurf/libhubbub/test/Makefile
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/Makefile
rename to contrib/network/netsurf/libhubbub/test/Makefile
diff --git a/programs/network/netsurf/libhubbub/test/README b/contrib/network/netsurf/libhubbub/test/README
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/README
rename to contrib/network/netsurf/libhubbub/test/README
diff --git a/programs/network/netsurf/libhubbub/test/csdetect.c b/contrib/network/netsurf/libhubbub/test/csdetect.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/csdetect.c
rename to contrib/network/netsurf/libhubbub/test/csdetect.c
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/INDEX b/contrib/network/netsurf/libhubbub/test/data/csdetect/INDEX
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/INDEX
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/INDEX
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/bom.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/bom.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/bom.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/bom.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/non-ascii-meta.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/non-ascii-meta.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/non-ascii-meta.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/non-ascii-meta.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/overrides.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/overrides.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/overrides.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/overrides.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/regression.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/regression.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/regression.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/regression.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/test-yahoo-jp.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/test-yahoo-jp.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/test-yahoo-jp.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/test-yahoo-jp.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/tests1.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/tests1.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/tests1.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/tests1.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/csdetect/tests2.dat b/contrib/network/netsurf/libhubbub/test/data/csdetect/tests2.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/csdetect/tests2.dat
rename to contrib/network/netsurf/libhubbub/test/data/csdetect/tests2.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/html/DocumentIndex.jsp b/contrib/network/netsurf/libhubbub/test/data/html/DocumentIndex.jsp
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/DocumentIndex.jsp
rename to contrib/network/netsurf/libhubbub/test/data/html/DocumentIndex.jsp
diff --git a/programs/network/netsurf/libhubbub/test/data/html/INDEX b/contrib/network/netsurf/libhubbub/test/data/html/INDEX
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/INDEX
rename to contrib/network/netsurf/libhubbub/test/data/html/INDEX
diff --git a/programs/network/netsurf/libhubbub/test/data/html/ccr.coriell.org.html b/contrib/network/netsurf/libhubbub/test/data/html/ccr.coriell.org.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/ccr.coriell.org.html
rename to contrib/network/netsurf/libhubbub/test/data/html/ccr.coriell.org.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/d11MXs.2WQ9.d.htm b/contrib/network/netsurf/libhubbub/test/data/html/d11MXs.2WQ9.d.htm
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/d11MXs.2WQ9.d.htm
rename to contrib/network/netsurf/libhubbub/test/data/html/d11MXs.2WQ9.d.htm
diff --git a/programs/network/netsurf/libhubbub/test/data/html/firmaer.phtml b/contrib/network/netsurf/libhubbub/test/data/html/firmaer.phtml
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/firmaer.phtml
rename to contrib/network/netsurf/libhubbub/test/data/html/firmaer.phtml
diff --git a/programs/network/netsurf/libhubbub/test/data/html/initial-close-tag.html b/contrib/network/netsurf/libhubbub/test/data/html/initial-close-tag.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/initial-close-tag.html
rename to contrib/network/netsurf/libhubbub/test/data/html/initial-close-tag.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/isindex.html b/contrib/network/netsurf/libhubbub/test/data/html/isindex.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/isindex.html
rename to contrib/network/netsurf/libhubbub/test/data/html/isindex.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/mangleme.1.html b/contrib/network/netsurf/libhubbub/test/data/html/mangleme.1.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/mangleme.1.html
rename to contrib/network/netsurf/libhubbub/test/data/html/mangleme.1.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/mangleme.2.html b/contrib/network/netsurf/libhubbub/test/data/html/mangleme.2.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/mangleme.2.html
rename to contrib/network/netsurf/libhubbub/test/data/html/mangleme.2.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/mangleme.3.html b/contrib/network/netsurf/libhubbub/test/data/html/mangleme.3.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/mangleme.3.html
rename to contrib/network/netsurf/libhubbub/test/data/html/mangleme.3.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/misnested.html b/contrib/network/netsurf/libhubbub/test/data/html/misnested.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/misnested.html
rename to contrib/network/netsurf/libhubbub/test/data/html/misnested.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/phonecalls.html b/contrib/network/netsurf/libhubbub/test/data/html/phonecalls.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/phonecalls.html
rename to contrib/network/netsurf/libhubbub/test/data/html/phonecalls.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/regression-script-collect.html b/contrib/network/netsurf/libhubbub/test/data/html/regression-script-collect.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/regression-script-collect.html
rename to contrib/network/netsurf/libhubbub/test/data/html/regression-script-collect.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/section-tree-construction.html b/contrib/network/netsurf/libhubbub/test/data/html/section-tree-construction.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/section-tree-construction.html
rename to contrib/network/netsurf/libhubbub/test/data/html/section-tree-construction.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/wbh.co.uk.html b/contrib/network/netsurf/libhubbub/test/data/html/wbh.co.uk.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/wbh.co.uk.html
rename to contrib/network/netsurf/libhubbub/test/data/html/wbh.co.uk.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/www.directline.com.html b/contrib/network/netsurf/libhubbub/test/data/html/www.directline.com.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/www.directline.com.html
rename to contrib/network/netsurf/libhubbub/test/data/html/www.directline.com.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/www.fhis.ubc.ca.html b/contrib/network/netsurf/libhubbub/test/data/html/www.fhis.ubc.ca.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/www.fhis.ubc.ca.html
rename to contrib/network/netsurf/libhubbub/test/data/html/www.fhis.ubc.ca.html
diff --git a/programs/network/netsurf/libhubbub/test/data/html/www.hanazonohifuku.com.html b/contrib/network/netsurf/libhubbub/test/data/html/www.hanazonohifuku.com.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/html/www.hanazonohifuku.com.html
rename to contrib/network/netsurf/libhubbub/test/data/html/www.hanazonohifuku.com.html
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/INDEX b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/INDEX
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/INDEX
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/INDEX
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/cdata.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/cdata.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/cdata.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/cdata.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/contentModelFlags.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/contentModelFlags.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/contentModelFlags.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/contentModelFlags.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/entities.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/entities.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/entities.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/entities.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/escapeFlag.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/escapeFlag.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/escapeFlag.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/escapeFlag.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/numericEntities.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/numericEntities.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/numericEntities.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/numericEntities.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/regression.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/regression.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/regression.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/regression.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/test1.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/test1.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/test1.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/test1.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/test2.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/test2.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/test2.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/test2.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/test3.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/test3.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/test3.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/test3.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/test4.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/test4.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/test4.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/test4.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tokeniser2/unicodeChars.test b/contrib/network/netsurf/libhubbub/test/data/tokeniser2/unicodeChars.test
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tokeniser2/unicodeChars.test
rename to contrib/network/netsurf/libhubbub/test/data/tokeniser2/unicodeChars.test
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-chunks/INDEX b/contrib/network/netsurf/libhubbub/test/data/tree-chunks/INDEX
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-chunks/INDEX
rename to contrib/network/netsurf/libhubbub/test/data/tree-chunks/INDEX
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-chunks/basic.dat b/contrib/network/netsurf/libhubbub/test/data/tree-chunks/basic.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-chunks/basic.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-chunks/basic.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-chunks/entitytest.html b/contrib/network/netsurf/libhubbub/test/data/tree-chunks/entitytest.html
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-chunks/entitytest.html
rename to contrib/network/netsurf/libhubbub/test/data/tree-chunks/entitytest.html
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/INDEX b/contrib/network/netsurf/libhubbub/test/data/tree-construction/INDEX
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/INDEX
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/INDEX
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/after-after-body.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/after-after-body.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/after-after-body.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/after-after-body.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/after-after-frameset.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/after-after-frameset.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/after-after-frameset.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/after-after-frameset.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/after-body.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/after-body.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/after-body.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/after-body.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/regression.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/regression.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/regression.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/regression.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests1.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests1.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests1.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests1.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests10.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests10.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests10.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests10.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests11.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests11.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests11.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests11.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests12.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests12.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests12.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests12.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests2.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests2.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests2.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests2.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests3.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests3.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests3.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests3.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests4.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests4.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests4.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests4.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests5.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests5.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests5.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests5.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests6.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests6.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests6.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests6.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests7.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests7.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests7.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests7.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests8.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests8.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests8.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests8.dat
diff --git a/programs/network/netsurf/libhubbub/test/data/tree-construction/tests9.dat b/contrib/network/netsurf/libhubbub/test/data/tree-construction/tests9.dat
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/data/tree-construction/tests9.dat
rename to contrib/network/netsurf/libhubbub/test/data/tree-construction/tests9.dat
diff --git a/programs/network/netsurf/libhubbub/test/entities.c b/contrib/network/netsurf/libhubbub/test/entities.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/entities.c
rename to contrib/network/netsurf/libhubbub/test/entities.c
diff --git a/programs/network/netsurf/libhubbub/test/parser.c b/contrib/network/netsurf/libhubbub/test/parser.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/parser.c
rename to contrib/network/netsurf/libhubbub/test/parser.c
diff --git a/programs/network/netsurf/libhubbub/test/testutils.h b/contrib/network/netsurf/libhubbub/test/testutils.h
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/testutils.h
rename to contrib/network/netsurf/libhubbub/test/testutils.h
diff --git a/programs/network/netsurf/libhubbub/test/tokeniser.c b/contrib/network/netsurf/libhubbub/test/tokeniser.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/tokeniser.c
rename to contrib/network/netsurf/libhubbub/test/tokeniser.c
diff --git a/programs/network/netsurf/libhubbub/test/tokeniser2.c b/contrib/network/netsurf/libhubbub/test/tokeniser2.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/tokeniser2.c
rename to contrib/network/netsurf/libhubbub/test/tokeniser2.c
diff --git a/programs/network/netsurf/libhubbub/test/tokeniser3.c b/contrib/network/netsurf/libhubbub/test/tokeniser3.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/tokeniser3.c
rename to contrib/network/netsurf/libhubbub/test/tokeniser3.c
diff --git a/programs/network/netsurf/libhubbub/test/tree-buf.c b/contrib/network/netsurf/libhubbub/test/tree-buf.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/tree-buf.c
rename to contrib/network/netsurf/libhubbub/test/tree-buf.c
diff --git a/programs/network/netsurf/libhubbub/test/tree.c b/contrib/network/netsurf/libhubbub/test/tree.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/tree.c
rename to contrib/network/netsurf/libhubbub/test/tree.c
diff --git a/programs/network/netsurf/libhubbub/test/tree2.c b/contrib/network/netsurf/libhubbub/test/tree2.c
similarity index 100%
rename from programs/network/netsurf/libhubbub/test/tree2.c
rename to contrib/network/netsurf/libhubbub/test/tree2.c
diff --git a/programs/network/netsurf/libnsbmp/.gitignore b/contrib/network/netsurf/libnsbmp/.gitignore
similarity index 100%
rename from programs/network/netsurf/libnsbmp/.gitignore
rename to contrib/network/netsurf/libnsbmp/.gitignore
diff --git a/programs/network/netsurf/libnsbmp/COPYING b/contrib/network/netsurf/libnsbmp/COPYING
similarity index 100%
rename from programs/network/netsurf/libnsbmp/COPYING
rename to contrib/network/netsurf/libnsbmp/COPYING
diff --git a/programs/network/netsurf/libnsbmp/Makefile b/contrib/network/netsurf/libnsbmp/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsbmp/Makefile
rename to contrib/network/netsurf/libnsbmp/Makefile
diff --git a/programs/network/netsurf/libnsbmp/bmp_display b/contrib/network/netsurf/libnsbmp/bmp_display
similarity index 100%
rename from programs/network/netsurf/libnsbmp/bmp_display
rename to contrib/network/netsurf/libnsbmp/bmp_display
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g01bg.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01bg.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g01bg.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01bg.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g01bw.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01bw.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g01bw.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01bw.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g01p1.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01p1.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g01p1.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01p1.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g01wb.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01wb.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g01wb.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g01wb.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g04.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g04.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g04.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g04.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g04p4.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g04p4.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g04p4.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g04p4.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g04rle.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g04rle.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g04rle.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g04rle.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08offs.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08offs.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08offs.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08offs.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08os2.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08os2.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08os2.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08os2.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08p256.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08p256.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08p256.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08p256.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08p64.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08p64.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08p64.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08p64.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08pi256.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08pi256.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08pi256.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08pi256.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08pi64.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08pi64.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08pi64.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08pi64.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08res11.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08res11.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08res11.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08res11.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08res21.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08res21.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08res21.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08res21.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08res22.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08res22.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08res22.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08res22.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08rle.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08rle.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08rle.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08rle.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08s0.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08s0.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08s0.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08s0.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08w124.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08w124.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08w124.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08w124.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08w125.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08w125.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08w125.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08w125.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g08w126.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08w126.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g08w126.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g08w126.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g16bf555.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g16bf555.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g16bf555.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g16bf555.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g16bf565.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g16bf565.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g16bf565.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g16bf565.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g16def555.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g16def555.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g16def555.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g16def555.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g24.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g24.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g24.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g24.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g32bf.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g32bf.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g32bf.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g32bf.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/g32def.bmp b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/g32def.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/g32def.bmp
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/g32def.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/01bg.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/01bg.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/01bg.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/01bg.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/01bw.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/01bw.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/01bw.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/01bw.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/01p1.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/01p1.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/01p1.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/01p1.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/04.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/04.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/04.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/04.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/04p4.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/04p4.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/04p4.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/04p4.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08p64.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08p64.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08p64.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08p64.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08w124.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08w124.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08w124.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08w124.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08w125.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08w125.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08w125.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08w125.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08w126.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08w126.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/08w126.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/08w126.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf555.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf555.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf555.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf555.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf565.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf565.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf565.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/16bf565.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/24.png b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/24.png
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/24.png
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/24.png
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/png/reference.html b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/reference.html
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/png/reference.html
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/png/reference.html
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/readme.txt b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/readme.txt
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/readme.txt
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/readme.txt
diff --git a/programs/network/netsurf/libnsbmp/examples/bmpsuite/test.html b/contrib/network/netsurf/libnsbmp/examples/bmpsuite/test.html
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/bmpsuite/test.html
rename to contrib/network/netsurf/libnsbmp/examples/bmpsuite/test.html
diff --git a/programs/network/netsurf/libnsbmp/examples/decode_bmp.c b/contrib/network/netsurf/libnsbmp/examples/decode_bmp.c
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/decode_bmp.c
rename to contrib/network/netsurf/libnsbmp/examples/decode_bmp.c
diff --git a/programs/network/netsurf/libnsbmp/examples/decode_ico.c b/contrib/network/netsurf/libnsbmp/examples/decode_ico.c
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/decode_ico.c
rename to contrib/network/netsurf/libnsbmp/examples/decode_ico.c
diff --git a/programs/network/netsurf/libnsbmp/examples/linux.bmp b/contrib/network/netsurf/libnsbmp/examples/linux.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/linux.bmp
rename to contrib/network/netsurf/libnsbmp/examples/linux.bmp
diff --git a/programs/network/netsurf/libnsbmp/examples/monitor.ico b/contrib/network/netsurf/libnsbmp/examples/monitor.ico
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/monitor.ico
rename to contrib/network/netsurf/libnsbmp/examples/monitor.ico
diff --git a/programs/network/netsurf/libnsbmp/examples/ro.bmp b/contrib/network/netsurf/libnsbmp/examples/ro.bmp
similarity index 100%
rename from programs/network/netsurf/libnsbmp/examples/ro.bmp
rename to contrib/network/netsurf/libnsbmp/examples/ro.bmp
diff --git a/programs/network/netsurf/libnsbmp/ico_display b/contrib/network/netsurf/libnsbmp/ico_display
similarity index 100%
rename from programs/network/netsurf/libnsbmp/ico_display
rename to contrib/network/netsurf/libnsbmp/ico_display
diff --git a/programs/network/netsurf/libnsbmp/include/libnsbmp.h b/contrib/network/netsurf/libnsbmp/include/libnsbmp.h
similarity index 100%
rename from programs/network/netsurf/libnsbmp/include/libnsbmp.h
rename to contrib/network/netsurf/libnsbmp/include/libnsbmp.h
diff --git a/programs/network/netsurf/libnsbmp/libnsbmp.pc.in b/contrib/network/netsurf/libnsbmp/libnsbmp.pc.in
similarity index 100%
rename from programs/network/netsurf/libnsbmp/libnsbmp.pc.in
rename to contrib/network/netsurf/libnsbmp/libnsbmp.pc.in
diff --git a/programs/network/netsurf/libnsbmp/src/Makefile b/contrib/network/netsurf/libnsbmp/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsbmp/src/Makefile
rename to contrib/network/netsurf/libnsbmp/src/Makefile
diff --git a/programs/network/netsurf/libnsbmp/src/libnsbmp.c b/contrib/network/netsurf/libnsbmp/src/libnsbmp.c
similarity index 100%
rename from programs/network/netsurf/libnsbmp/src/libnsbmp.c
rename to contrib/network/netsurf/libnsbmp/src/libnsbmp.c
diff --git a/programs/network/netsurf/libnsbmp/src/utils/log.h b/contrib/network/netsurf/libnsbmp/src/utils/log.h
similarity index 100%
rename from programs/network/netsurf/libnsbmp/src/utils/log.h
rename to contrib/network/netsurf/libnsbmp/src/utils/log.h
diff --git a/programs/network/netsurf/libnsfb/.gitignore b/contrib/network/netsurf/libnsfb/.gitignore
similarity index 100%
rename from programs/network/netsurf/libnsfb/.gitignore
rename to contrib/network/netsurf/libnsfb/.gitignore
diff --git a/programs/network/netsurf/libnsfb/Makefile b/contrib/network/netsurf/libnsfb/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsfb/Makefile
rename to contrib/network/netsurf/libnsfb/Makefile
diff --git a/programs/network/netsurf/libnsfb/NOTE b/contrib/network/netsurf/libnsfb/NOTE
similarity index 100%
rename from programs/network/netsurf/libnsfb/NOTE
rename to contrib/network/netsurf/libnsfb/NOTE
diff --git a/programs/network/netsurf/libnsfb/include/cursor.h b/contrib/network/netsurf/libnsfb/include/cursor.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/cursor.h
rename to contrib/network/netsurf/libnsfb/include/cursor.h
diff --git a/programs/network/netsurf/libnsfb/include/libnsfb.h b/contrib/network/netsurf/libnsfb/include/libnsfb.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/libnsfb.h
rename to contrib/network/netsurf/libnsfb/include/libnsfb.h
diff --git a/programs/network/netsurf/libnsfb/include/libnsfb_cursor.h b/contrib/network/netsurf/libnsfb/include/libnsfb_cursor.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/libnsfb_cursor.h
rename to contrib/network/netsurf/libnsfb/include/libnsfb_cursor.h
diff --git a/programs/network/netsurf/libnsfb/include/libnsfb_event.h b/contrib/network/netsurf/libnsfb/include/libnsfb_event.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/libnsfb_event.h
rename to contrib/network/netsurf/libnsfb/include/libnsfb_event.h
diff --git a/programs/network/netsurf/libnsfb/include/libnsfb_plot.h b/contrib/network/netsurf/libnsfb/include/libnsfb_plot.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/libnsfb_plot.h
rename to contrib/network/netsurf/libnsfb/include/libnsfb_plot.h
diff --git a/programs/network/netsurf/libnsfb/include/libnsfb_plot_util.h b/contrib/network/netsurf/libnsfb/include/libnsfb_plot_util.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/libnsfb_plot_util.h
rename to contrib/network/netsurf/libnsfb/include/libnsfb_plot_util.h
diff --git a/programs/network/netsurf/libnsfb/include/nsfb.h b/contrib/network/netsurf/libnsfb/include/nsfb.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/nsfb.h
rename to contrib/network/netsurf/libnsfb/include/nsfb.h
diff --git a/programs/network/netsurf/libnsfb/include/palette.h b/contrib/network/netsurf/libnsfb/include/palette.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/palette.h
rename to contrib/network/netsurf/libnsfb/include/palette.h
diff --git a/programs/network/netsurf/libnsfb/include/plot.h b/contrib/network/netsurf/libnsfb/include/plot.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/plot.h
rename to contrib/network/netsurf/libnsfb/include/plot.h
diff --git a/programs/network/netsurf/libnsfb/include/surface.h b/contrib/network/netsurf/libnsfb/include/surface.h
similarity index 100%
rename from programs/network/netsurf/libnsfb/include/surface.h
rename to contrib/network/netsurf/libnsfb/include/surface.h
diff --git a/programs/network/netsurf/libnsfb/libnsfb.pc.in b/contrib/network/netsurf/libnsfb/libnsfb.pc.in
similarity index 100%
rename from programs/network/netsurf/libnsfb/libnsfb.pc.in
rename to contrib/network/netsurf/libnsfb/libnsfb.pc.in
diff --git a/programs/network/netsurf/libnsfb/src/Makefile b/contrib/network/netsurf/libnsfb/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/Makefile
rename to contrib/network/netsurf/libnsfb/src/Makefile
diff --git a/programs/network/netsurf/libnsfb/src/cursor.c b/contrib/network/netsurf/libnsfb/src/cursor.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/cursor.c
rename to contrib/network/netsurf/libnsfb/src/cursor.c
diff --git a/programs/network/netsurf/libnsfb/src/dump.c b/contrib/network/netsurf/libnsfb/src/dump.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/dump.c
rename to contrib/network/netsurf/libnsfb/src/dump.c
diff --git a/programs/network/netsurf/libnsfb/src/libnsfb.c b/contrib/network/netsurf/libnsfb/src/libnsfb.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/libnsfb.c
rename to contrib/network/netsurf/libnsfb/src/libnsfb.c
diff --git a/programs/network/netsurf/libnsfb/src/palette.c b/contrib/network/netsurf/libnsfb/src/palette.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/palette.c
rename to contrib/network/netsurf/libnsfb/src/palette.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/16bpp.c b/contrib/network/netsurf/libnsfb/src/plot/16bpp.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/16bpp.c
rename to contrib/network/netsurf/libnsfb/src/plot/16bpp.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/1bpp.c b/contrib/network/netsurf/libnsfb/src/plot/1bpp.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/1bpp.c
rename to contrib/network/netsurf/libnsfb/src/plot/1bpp.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/24bpp.c b/contrib/network/netsurf/libnsfb/src/plot/24bpp.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/24bpp.c
rename to contrib/network/netsurf/libnsfb/src/plot/24bpp.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/32bpp-common.c b/contrib/network/netsurf/libnsfb/src/plot/32bpp-common.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/32bpp-common.c
rename to contrib/network/netsurf/libnsfb/src/plot/32bpp-common.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/32bpp-xbgr8888.c b/contrib/network/netsurf/libnsfb/src/plot/32bpp-xbgr8888.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/32bpp-xbgr8888.c
rename to contrib/network/netsurf/libnsfb/src/plot/32bpp-xbgr8888.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/32bpp-xrgb8888.c b/contrib/network/netsurf/libnsfb/src/plot/32bpp-xrgb8888.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/32bpp-xrgb8888.c
rename to contrib/network/netsurf/libnsfb/src/plot/32bpp-xrgb8888.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/8bpp.c b/contrib/network/netsurf/libnsfb/src/plot/8bpp.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/8bpp.c
rename to contrib/network/netsurf/libnsfb/src/plot/8bpp.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/Makefile b/contrib/network/netsurf/libnsfb/src/plot/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/Makefile
rename to contrib/network/netsurf/libnsfb/src/plot/Makefile
diff --git a/programs/network/netsurf/libnsfb/src/plot/api.c b/contrib/network/netsurf/libnsfb/src/plot/api.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/api.c
rename to contrib/network/netsurf/libnsfb/src/plot/api.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/common.c b/contrib/network/netsurf/libnsfb/src/plot/common.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/common.c
rename to contrib/network/netsurf/libnsfb/src/plot/common.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/generic.c b/contrib/network/netsurf/libnsfb/src/plot/generic.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/generic.c
rename to contrib/network/netsurf/libnsfb/src/plot/generic.c
diff --git a/programs/network/netsurf/libnsfb/src/plot/util.c b/contrib/network/netsurf/libnsfb/src/plot/util.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/plot/util.c
rename to contrib/network/netsurf/libnsfb/src/plot/util.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/Makefile b/contrib/network/netsurf/libnsfb/src/surface/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/Makefile
rename to contrib/network/netsurf/libnsfb/src/surface/Makefile
diff --git a/programs/network/netsurf/libnsfb/src/surface/able.c b/contrib/network/netsurf/libnsfb/src/surface/able.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/able.c
rename to contrib/network/netsurf/libnsfb/src/surface/able.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/kolibri.c b/contrib/network/netsurf/libnsfb/src/surface/kolibri.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/kolibri.c
rename to contrib/network/netsurf/libnsfb/src/surface/kolibri.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/linux.c b/contrib/network/netsurf/libnsfb/src/surface/linux.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/linux.c
rename to contrib/network/netsurf/libnsfb/src/surface/linux.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/ram.c b/contrib/network/netsurf/libnsfb/src/surface/ram.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/ram.c
rename to contrib/network/netsurf/libnsfb/src/surface/ram.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/sdl.c b/contrib/network/netsurf/libnsfb/src/surface/sdl.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/sdl.c
rename to contrib/network/netsurf/libnsfb/src/surface/sdl.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/surface.c b/contrib/network/netsurf/libnsfb/src/surface/surface.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/surface.c
rename to contrib/network/netsurf/libnsfb/src/surface/surface.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/vnc.c b/contrib/network/netsurf/libnsfb/src/surface/vnc.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/vnc.c
rename to contrib/network/netsurf/libnsfb/src/surface/vnc.c
diff --git a/programs/network/netsurf/libnsfb/src/surface/x.c b/contrib/network/netsurf/libnsfb/src/surface/x.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/src/surface/x.c
rename to contrib/network/netsurf/libnsfb/src/surface/x.c
diff --git a/programs/network/netsurf/libnsfb/test/Makefile b/contrib/network/netsurf/libnsfb/test/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/Makefile
rename to contrib/network/netsurf/libnsfb/test/Makefile
diff --git a/programs/network/netsurf/libnsfb/test/bezier b/contrib/network/netsurf/libnsfb/test/bezier
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/bezier
rename to contrib/network/netsurf/libnsfb/test/bezier
diff --git a/programs/network/netsurf/libnsfb/test/bezier.c b/contrib/network/netsurf/libnsfb/test/bezier.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/bezier.c
rename to contrib/network/netsurf/libnsfb/test/bezier.c
diff --git a/programs/network/netsurf/libnsfb/test/bezier.map b/contrib/network/netsurf/libnsfb/test/bezier.map
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/bezier.map
rename to contrib/network/netsurf/libnsfb/test/bezier.map
diff --git a/programs/network/netsurf/libnsfb/test/bitmap b/contrib/network/netsurf/libnsfb/test/bitmap
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/bitmap
rename to contrib/network/netsurf/libnsfb/test/bitmap
diff --git a/programs/network/netsurf/libnsfb/test/bitmap.c b/contrib/network/netsurf/libnsfb/test/bitmap.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/bitmap.c
rename to contrib/network/netsurf/libnsfb/test/bitmap.c
diff --git a/programs/network/netsurf/libnsfb/test/bitmap.map b/contrib/network/netsurf/libnsfb/test/bitmap.map
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/bitmap.map
rename to contrib/network/netsurf/libnsfb/test/bitmap.map
diff --git a/programs/network/netsurf/libnsfb/test/frontend.c b/contrib/network/netsurf/libnsfb/test/frontend.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/frontend.c
rename to contrib/network/netsurf/libnsfb/test/frontend.c
diff --git a/programs/network/netsurf/libnsfb/test/nsglobe.c b/contrib/network/netsurf/libnsfb/test/nsglobe.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/nsglobe.c
rename to contrib/network/netsurf/libnsfb/test/nsglobe.c
diff --git a/programs/network/netsurf/libnsfb/test/path.c b/contrib/network/netsurf/libnsfb/test/path.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/path.c
rename to contrib/network/netsurf/libnsfb/test/path.c
diff --git a/programs/network/netsurf/libnsfb/test/plottest.c b/contrib/network/netsurf/libnsfb/test/plottest.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/plottest.c
rename to contrib/network/netsurf/libnsfb/test/plottest.c
diff --git a/programs/network/netsurf/libnsfb/test/polygon b/contrib/network/netsurf/libnsfb/test/polygon
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/polygon
rename to contrib/network/netsurf/libnsfb/test/polygon
diff --git a/programs/network/netsurf/libnsfb/test/polygon.c b/contrib/network/netsurf/libnsfb/test/polygon.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/polygon.c
rename to contrib/network/netsurf/libnsfb/test/polygon.c
diff --git a/programs/network/netsurf/libnsfb/test/polygon.map b/contrib/network/netsurf/libnsfb/test/polygon.map
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/polygon.map
rename to contrib/network/netsurf/libnsfb/test/polygon.map
diff --git a/programs/network/netsurf/libnsfb/test/polystar.c b/contrib/network/netsurf/libnsfb/test/polystar.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/polystar.c
rename to contrib/network/netsurf/libnsfb/test/polystar.c
diff --git a/programs/network/netsurf/libnsfb/test/polystar2.c b/contrib/network/netsurf/libnsfb/test/polystar2.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/polystar2.c
rename to contrib/network/netsurf/libnsfb/test/polystar2.c
diff --git a/programs/network/netsurf/libnsfb/test/runtest.sh b/contrib/network/netsurf/libnsfb/test/runtest.sh
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/runtest.sh
rename to contrib/network/netsurf/libnsfb/test/runtest.sh
diff --git a/programs/network/netsurf/libnsfb/test/svgtiny.c b/contrib/network/netsurf/libnsfb/test/svgtiny.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/svgtiny.c
rename to contrib/network/netsurf/libnsfb/test/svgtiny.c
diff --git a/programs/network/netsurf/libnsfb/test/text-speed.c b/contrib/network/netsurf/libnsfb/test/text-speed.c
similarity index 100%
rename from programs/network/netsurf/libnsfb/test/text-speed.c
rename to contrib/network/netsurf/libnsfb/test/text-speed.c
diff --git a/programs/network/netsurf/libnsfb/usage b/contrib/network/netsurf/libnsfb/usage
similarity index 100%
rename from programs/network/netsurf/libnsfb/usage
rename to contrib/network/netsurf/libnsfb/usage
diff --git a/programs/network/netsurf/libnsgif/.gitignore b/contrib/network/netsurf/libnsgif/.gitignore
similarity index 100%
rename from programs/network/netsurf/libnsgif/.gitignore
rename to contrib/network/netsurf/libnsgif/.gitignore
diff --git a/programs/network/netsurf/libnsgif/COPYING b/contrib/network/netsurf/libnsgif/COPYING
similarity index 100%
rename from programs/network/netsurf/libnsgif/COPYING
rename to contrib/network/netsurf/libnsgif/COPYING
diff --git a/programs/network/netsurf/libnsgif/Makefile b/contrib/network/netsurf/libnsgif/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsgif/Makefile
rename to contrib/network/netsurf/libnsgif/Makefile
diff --git a/programs/network/netsurf/libnsgif/examples/decode_gif.c b/contrib/network/netsurf/libnsgif/examples/decode_gif.c
similarity index 100%
rename from programs/network/netsurf/libnsgif/examples/decode_gif.c
rename to contrib/network/netsurf/libnsgif/examples/decode_gif.c
diff --git a/programs/network/netsurf/libnsgif/examples/disassemble_gif.pl b/contrib/network/netsurf/libnsgif/examples/disassemble_gif.pl
similarity index 100%
rename from programs/network/netsurf/libnsgif/examples/disassemble_gif.pl
rename to contrib/network/netsurf/libnsgif/examples/disassemble_gif.pl
diff --git a/programs/network/netsurf/libnsgif/examples/waves.gif b/contrib/network/netsurf/libnsgif/examples/waves.gif
similarity index 100%
rename from programs/network/netsurf/libnsgif/examples/waves.gif
rename to contrib/network/netsurf/libnsgif/examples/waves.gif
diff --git a/programs/network/netsurf/libnsgif/gif_display b/contrib/network/netsurf/libnsgif/gif_display
similarity index 100%
rename from programs/network/netsurf/libnsgif/gif_display
rename to contrib/network/netsurf/libnsgif/gif_display
diff --git a/programs/network/netsurf/libnsgif/include/libnsgif.h b/contrib/network/netsurf/libnsgif/include/libnsgif.h
similarity index 100%
rename from programs/network/netsurf/libnsgif/include/libnsgif.h
rename to contrib/network/netsurf/libnsgif/include/libnsgif.h
diff --git a/programs/network/netsurf/libnsgif/libnsgif.pc.in b/contrib/network/netsurf/libnsgif/libnsgif.pc.in
similarity index 100%
rename from programs/network/netsurf/libnsgif/libnsgif.pc.in
rename to contrib/network/netsurf/libnsgif/libnsgif.pc.in
diff --git a/programs/network/netsurf/libnsgif/src/Makefile b/contrib/network/netsurf/libnsgif/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libnsgif/src/Makefile
rename to contrib/network/netsurf/libnsgif/src/Makefile
diff --git a/programs/network/netsurf/libnsgif/src/libnsgif.c b/contrib/network/netsurf/libnsgif/src/libnsgif.c
similarity index 100%
rename from programs/network/netsurf/libnsgif/src/libnsgif.c
rename to contrib/network/netsurf/libnsgif/src/libnsgif.c
diff --git a/programs/network/netsurf/libnsgif/src/utils/log.h b/contrib/network/netsurf/libnsgif/src/utils/log.h
similarity index 100%
rename from programs/network/netsurf/libnsgif/src/utils/log.h
rename to contrib/network/netsurf/libnsgif/src/utils/log.h
diff --git a/programs/network/netsurf/libparserutils/.gitignore b/contrib/network/netsurf/libparserutils/.gitignore
similarity index 100%
rename from programs/network/netsurf/libparserutils/.gitignore
rename to contrib/network/netsurf/libparserutils/.gitignore
diff --git a/programs/network/netsurf/libparserutils/COPYING b/contrib/network/netsurf/libparserutils/COPYING
similarity index 100%
rename from programs/network/netsurf/libparserutils/COPYING
rename to contrib/network/netsurf/libparserutils/COPYING
diff --git a/programs/network/netsurf/libparserutils/Makefile b/contrib/network/netsurf/libparserutils/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/Makefile
rename to contrib/network/netsurf/libparserutils/Makefile
diff --git a/programs/network/netsurf/libparserutils/Makefile.config b/contrib/network/netsurf/libparserutils/Makefile.config
similarity index 100%
rename from programs/network/netsurf/libparserutils/Makefile.config
rename to contrib/network/netsurf/libparserutils/Makefile.config
diff --git a/programs/network/netsurf/libparserutils/README b/contrib/network/netsurf/libparserutils/README
similarity index 100%
rename from programs/network/netsurf/libparserutils/README
rename to contrib/network/netsurf/libparserutils/README
diff --git a/programs/network/netsurf/libparserutils/build/Aliases b/contrib/network/netsurf/libparserutils/build/Aliases
similarity index 100%
rename from programs/network/netsurf/libparserutils/build/Aliases
rename to contrib/network/netsurf/libparserutils/build/Aliases
diff --git a/programs/network/netsurf/libparserutils/build/Doxyfile b/contrib/network/netsurf/libparserutils/build/Doxyfile
similarity index 100%
rename from programs/network/netsurf/libparserutils/build/Doxyfile
rename to contrib/network/netsurf/libparserutils/build/Doxyfile
diff --git a/programs/network/netsurf/libparserutils/build/conv.pl b/contrib/network/netsurf/libparserutils/build/conv.pl
similarity index 100%
rename from programs/network/netsurf/libparserutils/build/conv.pl
rename to contrib/network/netsurf/libparserutils/build/conv.pl
diff --git a/programs/network/netsurf/libparserutils/build/make-aliases.pl b/contrib/network/netsurf/libparserutils/build/make-aliases.pl
similarity index 100%
rename from programs/network/netsurf/libparserutils/build/make-aliases.pl
rename to contrib/network/netsurf/libparserutils/build/make-aliases.pl
diff --git a/programs/network/netsurf/libparserutils/docs/Todo b/contrib/network/netsurf/libparserutils/docs/Todo
similarity index 100%
rename from programs/network/netsurf/libparserutils/docs/Todo
rename to contrib/network/netsurf/libparserutils/docs/Todo
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/charset/codec.h b/contrib/network/netsurf/libparserutils/include/parserutils/charset/codec.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/charset/codec.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/charset/codec.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/charset/mibenum.h b/contrib/network/netsurf/libparserutils/include/parserutils/charset/mibenum.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/charset/mibenum.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/charset/mibenum.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/charset/utf16.h b/contrib/network/netsurf/libparserutils/include/parserutils/charset/utf16.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/charset/utf16.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/charset/utf16.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/charset/utf8.h b/contrib/network/netsurf/libparserutils/include/parserutils/charset/utf8.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/charset/utf8.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/charset/utf8.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/errors.h b/contrib/network/netsurf/libparserutils/include/parserutils/errors.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/errors.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/errors.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/functypes.h b/contrib/network/netsurf/libparserutils/include/parserutils/functypes.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/functypes.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/functypes.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/input/inputstream.h b/contrib/network/netsurf/libparserutils/include/parserutils/input/inputstream.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/input/inputstream.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/input/inputstream.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/parserutils.h b/contrib/network/netsurf/libparserutils/include/parserutils/parserutils.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/parserutils.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/parserutils.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/types.h b/contrib/network/netsurf/libparserutils/include/parserutils/types.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/types.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/types.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/utils/buffer.h b/contrib/network/netsurf/libparserutils/include/parserutils/utils/buffer.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/utils/buffer.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/utils/buffer.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/utils/stack.h b/contrib/network/netsurf/libparserutils/include/parserutils/utils/stack.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/utils/stack.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/utils/stack.h
diff --git a/programs/network/netsurf/libparserutils/include/parserutils/utils/vector.h b/contrib/network/netsurf/libparserutils/include/parserutils/utils/vector.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/include/parserutils/utils/vector.h
rename to contrib/network/netsurf/libparserutils/include/parserutils/utils/vector.h
diff --git a/programs/network/netsurf/libparserutils/libparserutils.pc.in b/contrib/network/netsurf/libparserutils/libparserutils.pc.in
similarity index 100%
rename from programs/network/netsurf/libparserutils/libparserutils.pc.in
rename to contrib/network/netsurf/libparserutils/libparserutils.pc.in
diff --git a/programs/network/netsurf/libparserutils/src/Makefile b/contrib/network/netsurf/libparserutils/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/Makefile
rename to contrib/network/netsurf/libparserutils/src/Makefile
diff --git a/programs/network/netsurf/libparserutils/src/charset/Makefile b/contrib/network/netsurf/libparserutils/src/charset/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/Makefile
rename to contrib/network/netsurf/libparserutils/src/charset/Makefile
diff --git a/programs/network/netsurf/libparserutils/src/charset/aliases.c b/contrib/network/netsurf/libparserutils/src/charset/aliases.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/aliases.c
rename to contrib/network/netsurf/libparserutils/src/charset/aliases.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/aliases.h b/contrib/network/netsurf/libparserutils/src/charset/aliases.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/aliases.h
rename to contrib/network/netsurf/libparserutils/src/charset/aliases.h
diff --git a/programs/network/netsurf/libparserutils/src/charset/aliases.inc b/contrib/network/netsurf/libparserutils/src/charset/aliases.inc
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/aliases.inc
rename to contrib/network/netsurf/libparserutils/src/charset/aliases.inc
diff --git a/programs/network/netsurf/libparserutils/src/charset/codec.c b/contrib/network/netsurf/libparserutils/src/charset/codec.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codec.c
rename to contrib/network/netsurf/libparserutils/src/charset/codec.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/8859_tables.h b/contrib/network/netsurf/libparserutils/src/charset/codecs/8859_tables.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/8859_tables.h
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/8859_tables.h
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/Makefile b/contrib/network/netsurf/libparserutils/src/charset/codecs/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/Makefile
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/Makefile
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/codec_8859.c b/contrib/network/netsurf/libparserutils/src/charset/codecs/codec_8859.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/codec_8859.c
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/codec_8859.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/codec_ascii.c b/contrib/network/netsurf/libparserutils/src/charset/codecs/codec_ascii.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/codec_ascii.c
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/codec_ascii.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/codec_ext8.c b/contrib/network/netsurf/libparserutils/src/charset/codecs/codec_ext8.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/codec_ext8.c
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/codec_ext8.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/codec_impl.h b/contrib/network/netsurf/libparserutils/src/charset/codecs/codec_impl.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/codec_impl.h
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/codec_impl.h
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/codec_utf16.c b/contrib/network/netsurf/libparserutils/src/charset/codecs/codec_utf16.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/codec_utf16.c
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/codec_utf16.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/codec_utf8.c b/contrib/network/netsurf/libparserutils/src/charset/codecs/codec_utf8.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/codec_utf8.c
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/codec_utf8.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/codecs/ext8_tables.h b/contrib/network/netsurf/libparserutils/src/charset/codecs/ext8_tables.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/codecs/ext8_tables.h
rename to contrib/network/netsurf/libparserutils/src/charset/codecs/ext8_tables.h
diff --git a/programs/network/netsurf/libparserutils/src/charset/encodings/Makefile b/contrib/network/netsurf/libparserutils/src/charset/encodings/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/encodings/Makefile
rename to contrib/network/netsurf/libparserutils/src/charset/encodings/Makefile
diff --git a/programs/network/netsurf/libparserutils/src/charset/encodings/utf16.c b/contrib/network/netsurf/libparserutils/src/charset/encodings/utf16.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/encodings/utf16.c
rename to contrib/network/netsurf/libparserutils/src/charset/encodings/utf16.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/encodings/utf8.c b/contrib/network/netsurf/libparserutils/src/charset/encodings/utf8.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/encodings/utf8.c
rename to contrib/network/netsurf/libparserutils/src/charset/encodings/utf8.c
diff --git a/programs/network/netsurf/libparserutils/src/charset/encodings/utf8impl.h b/contrib/network/netsurf/libparserutils/src/charset/encodings/utf8impl.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/charset/encodings/utf8impl.h
rename to contrib/network/netsurf/libparserutils/src/charset/encodings/utf8impl.h
diff --git a/programs/network/netsurf/libparserutils/src/input/Makefile b/contrib/network/netsurf/libparserutils/src/input/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/input/Makefile
rename to contrib/network/netsurf/libparserutils/src/input/Makefile
diff --git a/programs/network/netsurf/libparserutils/src/input/filter.c b/contrib/network/netsurf/libparserutils/src/input/filter.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/input/filter.c
rename to contrib/network/netsurf/libparserutils/src/input/filter.c
diff --git a/programs/network/netsurf/libparserutils/src/input/filter.h b/contrib/network/netsurf/libparserutils/src/input/filter.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/input/filter.h
rename to contrib/network/netsurf/libparserutils/src/input/filter.h
diff --git a/programs/network/netsurf/libparserutils/src/input/inputstream.c b/contrib/network/netsurf/libparserutils/src/input/inputstream.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/input/inputstream.c
rename to contrib/network/netsurf/libparserutils/src/input/inputstream.c
diff --git a/programs/network/netsurf/libparserutils/src/utils/Makefile b/contrib/network/netsurf/libparserutils/src/utils/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/Makefile
rename to contrib/network/netsurf/libparserutils/src/utils/Makefile
diff --git a/programs/network/netsurf/libparserutils/src/utils/buffer.c b/contrib/network/netsurf/libparserutils/src/utils/buffer.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/buffer.c
rename to contrib/network/netsurf/libparserutils/src/utils/buffer.c
diff --git a/programs/network/netsurf/libparserutils/src/utils/endian.h b/contrib/network/netsurf/libparserutils/src/utils/endian.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/endian.h
rename to contrib/network/netsurf/libparserutils/src/utils/endian.h
diff --git a/programs/network/netsurf/libparserutils/src/utils/errors.c b/contrib/network/netsurf/libparserutils/src/utils/errors.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/errors.c
rename to contrib/network/netsurf/libparserutils/src/utils/errors.c
diff --git a/programs/network/netsurf/libparserutils/src/utils/stack.c b/contrib/network/netsurf/libparserutils/src/utils/stack.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/stack.c
rename to contrib/network/netsurf/libparserutils/src/utils/stack.c
diff --git a/programs/network/netsurf/libparserutils/src/utils/utils.h b/contrib/network/netsurf/libparserutils/src/utils/utils.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/utils.h
rename to contrib/network/netsurf/libparserutils/src/utils/utils.h
diff --git a/programs/network/netsurf/libparserutils/src/utils/vector.c b/contrib/network/netsurf/libparserutils/src/utils/vector.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/src/utils/vector.c
rename to contrib/network/netsurf/libparserutils/src/utils/vector.c
diff --git a/programs/network/netsurf/libparserutils/test/INDEX b/contrib/network/netsurf/libparserutils/test/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/INDEX
rename to contrib/network/netsurf/libparserutils/test/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/Makefile b/contrib/network/netsurf/libparserutils/test/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/Makefile
rename to contrib/network/netsurf/libparserutils/test/Makefile
diff --git a/programs/network/netsurf/libparserutils/test/README b/contrib/network/netsurf/libparserutils/test/README
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/README
rename to contrib/network/netsurf/libparserutils/test/README
diff --git a/programs/network/netsurf/libparserutils/test/aliases.c b/contrib/network/netsurf/libparserutils/test/aliases.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/aliases.c
rename to contrib/network/netsurf/libparserutils/test/aliases.c
diff --git a/programs/network/netsurf/libparserutils/test/cscodec-8859.c b/contrib/network/netsurf/libparserutils/test/cscodec-8859.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/cscodec-8859.c
rename to contrib/network/netsurf/libparserutils/test/cscodec-8859.c
diff --git a/programs/network/netsurf/libparserutils/test/cscodec-ext8.c b/contrib/network/netsurf/libparserutils/test/cscodec-ext8.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/cscodec-ext8.c
rename to contrib/network/netsurf/libparserutils/test/cscodec-ext8.c
diff --git a/programs/network/netsurf/libparserutils/test/cscodec-utf16.c b/contrib/network/netsurf/libparserutils/test/cscodec-utf16.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/cscodec-utf16.c
rename to contrib/network/netsurf/libparserutils/test/cscodec-utf16.c
diff --git a/programs/network/netsurf/libparserutils/test/cscodec-utf8.c b/contrib/network/netsurf/libparserutils/test/cscodec-utf8.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/cscodec-utf8.c
rename to contrib/network/netsurf/libparserutils/test/cscodec-utf8.c
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/1.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/1.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/1.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/1.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/10.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/10.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/10.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/10.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/11.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/11.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/11.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/11.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/13.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/13.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/13.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/13.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/14.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/14.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/14.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/14.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/15.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/15.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/15.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/15.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/16.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/16.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/16.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/16.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/2.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/2.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/2.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/2.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/3.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/3.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/3.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/3.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/4.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/4.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/4.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/4.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/5.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/5.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/5.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/5.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/6.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/6.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/6.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/6.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/7.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/7.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/7.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/7.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/8.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/8.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/8.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/8.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/9.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/9.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/9.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/9.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-8859/INDEX b/contrib/network/netsurf/libparserutils/test/data/cscodec-8859/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-8859/INDEX
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-8859/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/INDEX b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/INDEX
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1250.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1250.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1250.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1250.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1251.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1251.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1251.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1251.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1252.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1252.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1252.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1252.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1253.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1253.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1253.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1253.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1254.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1254.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1254.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1254.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1255.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1255.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1255.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1255.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1256.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1256.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1256.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1256.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1257.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1257.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1257.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1257.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1258.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1258.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1258.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-ext8/cp1258.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-utf16/INDEX b/contrib/network/netsurf/libparserutils/test/data/cscodec-utf16/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-utf16/INDEX
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-utf16/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-utf16/simple.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-utf16/simple.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-utf16/simple.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-utf16/simple.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-utf8/INDEX b/contrib/network/netsurf/libparserutils/test/data/cscodec-utf8/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-utf8/INDEX
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-utf8/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-utf8/UTF-8-test.txt b/contrib/network/netsurf/libparserutils/test/data/cscodec-utf8/UTF-8-test.txt
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-utf8/UTF-8-test.txt
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-utf8/UTF-8-test.txt
diff --git a/programs/network/netsurf/libparserutils/test/data/cscodec-utf8/simple.dat b/contrib/network/netsurf/libparserutils/test/data/cscodec-utf8/simple.dat
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/cscodec-utf8/simple.dat
rename to contrib/network/netsurf/libparserutils/test/data/cscodec-utf8/simple.dat
diff --git a/programs/network/netsurf/libparserutils/test/data/input/INDEX b/contrib/network/netsurf/libparserutils/test/data/input/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/input/INDEX
rename to contrib/network/netsurf/libparserutils/test/data/input/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/data/input/UTF-8-test.txt b/contrib/network/netsurf/libparserutils/test/data/input/UTF-8-test.txt
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/data/input/UTF-8-test.txt
rename to contrib/network/netsurf/libparserutils/test/data/input/UTF-8-test.txt
diff --git a/programs/network/netsurf/libparserutils/test/filter.c b/contrib/network/netsurf/libparserutils/test/filter.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/filter.c
rename to contrib/network/netsurf/libparserutils/test/filter.c
diff --git a/programs/network/netsurf/libparserutils/test/inputstream.c b/contrib/network/netsurf/libparserutils/test/inputstream.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/inputstream.c
rename to contrib/network/netsurf/libparserutils/test/inputstream.c
diff --git a/programs/network/netsurf/libparserutils/test/regression/INDEX b/contrib/network/netsurf/libparserutils/test/regression/INDEX
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/regression/INDEX
rename to contrib/network/netsurf/libparserutils/test/regression/INDEX
diff --git a/programs/network/netsurf/libparserutils/test/regression/Makefile b/contrib/network/netsurf/libparserutils/test/regression/Makefile
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/regression/Makefile
rename to contrib/network/netsurf/libparserutils/test/regression/Makefile
diff --git a/programs/network/netsurf/libparserutils/test/regression/filter-badenc-segv.c b/contrib/network/netsurf/libparserutils/test/regression/filter-badenc-segv.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/regression/filter-badenc-segv.c
rename to contrib/network/netsurf/libparserutils/test/regression/filter-badenc-segv.c
diff --git a/programs/network/netsurf/libparserutils/test/regression/filter-segv.c b/contrib/network/netsurf/libparserutils/test/regression/filter-segv.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/regression/filter-segv.c
rename to contrib/network/netsurf/libparserutils/test/regression/filter-segv.c
diff --git a/programs/network/netsurf/libparserutils/test/regression/stream-nomem.c b/contrib/network/netsurf/libparserutils/test/regression/stream-nomem.c
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/regression/stream-nomem.c
rename to contrib/network/netsurf/libparserutils/test/regression/stream-nomem.c
diff --git a/programs/network/netsurf/libparserutils/test/testutils.h b/contrib/network/netsurf/libparserutils/test/testutils.h
similarity index 100%
rename from programs/network/netsurf/libparserutils/test/testutils.h
rename to contrib/network/netsurf/libparserutils/test/testutils.h
diff --git a/programs/network/netsurf/libwapcaplet/.gitignore b/contrib/network/netsurf/libwapcaplet/.gitignore
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/.gitignore
rename to contrib/network/netsurf/libwapcaplet/.gitignore
diff --git a/programs/network/netsurf/libwapcaplet/COPYING b/contrib/network/netsurf/libwapcaplet/COPYING
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/COPYING
rename to contrib/network/netsurf/libwapcaplet/COPYING
diff --git a/programs/network/netsurf/libwapcaplet/Makefile b/contrib/network/netsurf/libwapcaplet/Makefile
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/Makefile
rename to contrib/network/netsurf/libwapcaplet/Makefile
diff --git a/programs/network/netsurf/libwapcaplet/README b/contrib/network/netsurf/libwapcaplet/README
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/README
rename to contrib/network/netsurf/libwapcaplet/README
diff --git a/programs/network/netsurf/libwapcaplet/include/libwapcaplet/libwapcaplet.h b/contrib/network/netsurf/libwapcaplet/include/libwapcaplet/libwapcaplet.h
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/include/libwapcaplet/libwapcaplet.h
rename to contrib/network/netsurf/libwapcaplet/include/libwapcaplet/libwapcaplet.h
diff --git a/programs/network/netsurf/libwapcaplet/libwapcaplet.pc.in b/contrib/network/netsurf/libwapcaplet/libwapcaplet.pc.in
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/libwapcaplet.pc.in
rename to contrib/network/netsurf/libwapcaplet/libwapcaplet.pc.in
diff --git a/programs/network/netsurf/libwapcaplet/src/Makefile b/contrib/network/netsurf/libwapcaplet/src/Makefile
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/src/Makefile
rename to contrib/network/netsurf/libwapcaplet/src/Makefile
diff --git a/programs/network/netsurf/libwapcaplet/src/libwapcaplet.c b/contrib/network/netsurf/libwapcaplet/src/libwapcaplet.c
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/src/libwapcaplet.c
rename to contrib/network/netsurf/libwapcaplet/src/libwapcaplet.c
diff --git a/programs/network/netsurf/libwapcaplet/test/Makefile b/contrib/network/netsurf/libwapcaplet/test/Makefile
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/test/Makefile
rename to contrib/network/netsurf/libwapcaplet/test/Makefile
diff --git a/programs/network/netsurf/libwapcaplet/test/basictests.c b/contrib/network/netsurf/libwapcaplet/test/basictests.c
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/test/basictests.c
rename to contrib/network/netsurf/libwapcaplet/test/basictests.c
diff --git a/programs/network/netsurf/libwapcaplet/test/testmain.c b/contrib/network/netsurf/libwapcaplet/test/testmain.c
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/test/testmain.c
rename to contrib/network/netsurf/libwapcaplet/test/testmain.c
diff --git a/programs/network/netsurf/libwapcaplet/test/tests.h b/contrib/network/netsurf/libwapcaplet/test/tests.h
similarity index 100%
rename from programs/network/netsurf/libwapcaplet/test/tests.h
rename to contrib/network/netsurf/libwapcaplet/test/tests.h
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-AmigaCross b/contrib/network/netsurf/netsurf/Docs/BUILDING-AmigaCross
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-AmigaCross
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-AmigaCross
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-AmigaOS b/contrib/network/netsurf/netsurf/Docs/BUILDING-AmigaOS
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-AmigaOS
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-AmigaOS
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-BeOS b/contrib/network/netsurf/netsurf/Docs/BUILDING-BeOS
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-BeOS
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-BeOS
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-Cocoa b/contrib/network/netsurf/netsurf/Docs/BUILDING-Cocoa
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-Cocoa
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-Cocoa
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-Framebuffer b/contrib/network/netsurf/netsurf/Docs/BUILDING-Framebuffer
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-Framebuffer
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-Framebuffer
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-GTK b/contrib/network/netsurf/netsurf/Docs/BUILDING-GTK
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-GTK
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-GTK
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-Monkey b/contrib/network/netsurf/netsurf/Docs/BUILDING-Monkey
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-Monkey
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-Monkey
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-RISC_OS b/contrib/network/netsurf/netsurf/Docs/BUILDING-RISC_OS
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-RISC_OS
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-RISC_OS
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-ROCross b/contrib/network/netsurf/netsurf/Docs/BUILDING-ROCross
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-ROCross
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-ROCross
diff --git a/programs/network/netsurf/netsurf/Docs/BUILDING-Windows b/contrib/network/netsurf/netsurf/Docs/BUILDING-Windows
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/BUILDING-Windows
rename to contrib/network/netsurf/netsurf/Docs/BUILDING-Windows
diff --git a/programs/network/netsurf/netsurf/Docs/Doxyfile b/contrib/network/netsurf/netsurf/Docs/Doxyfile
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/Doxyfile
rename to contrib/network/netsurf/netsurf/Docs/Doxyfile
diff --git a/programs/network/netsurf/netsurf/Docs/LIBRARIES b/contrib/network/netsurf/netsurf/Docs/LIBRARIES
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/LIBRARIES
rename to contrib/network/netsurf/netsurf/Docs/LIBRARIES
diff --git a/programs/network/netsurf/netsurf/Docs/PACKAGING-GTK b/contrib/network/netsurf/netsurf/Docs/PACKAGING-GTK
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/PACKAGING-GTK
rename to contrib/network/netsurf/netsurf/Docs/PACKAGING-GTK
diff --git a/programs/network/netsurf/netsurf/Docs/USING-Framebuffer b/contrib/network/netsurf/netsurf/Docs/USING-Framebuffer
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/USING-Framebuffer
rename to contrib/network/netsurf/netsurf/Docs/USING-Framebuffer
diff --git a/programs/network/netsurf/netsurf/Docs/USING-Monkey b/contrib/network/netsurf/netsurf/Docs/USING-Monkey
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/USING-Monkey
rename to contrib/network/netsurf/netsurf/Docs/USING-Monkey
diff --git a/programs/network/netsurf/netsurf/Docs/ideas/cache.txt b/contrib/network/netsurf/netsurf/Docs/ideas/cache.txt
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/ideas/cache.txt
rename to contrib/network/netsurf/netsurf/Docs/ideas/cache.txt
diff --git a/programs/network/netsurf/netsurf/Docs/ideas/css-engine.txt b/contrib/network/netsurf/netsurf/Docs/ideas/css-engine.txt
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/ideas/css-engine.txt
rename to contrib/network/netsurf/netsurf/Docs/ideas/css-engine.txt
diff --git a/programs/network/netsurf/netsurf/Docs/ideas/render-library.txt b/contrib/network/netsurf/netsurf/Docs/ideas/render-library.txt
similarity index 100%
rename from programs/network/netsurf/netsurf/Docs/ideas/render-library.txt
rename to contrib/network/netsurf/netsurf/Docs/ideas/render-library.txt
diff --git a/programs/network/netsurf/netsurf/Makebig b/contrib/network/netsurf/netsurf/Makebig
similarity index 100%
rename from programs/network/netsurf/netsurf/Makebig
rename to contrib/network/netsurf/netsurf/Makebig
diff --git a/programs/network/netsurf/netsurf/Makefile b/contrib/network/netsurf/netsurf/Makefile
similarity index 100%
rename from programs/network/netsurf/netsurf/Makefile
rename to contrib/network/netsurf/netsurf/Makefile
diff --git a/programs/network/netsurf/netsurf/Makefile.config.example b/contrib/network/netsurf/netsurf/Makefile.config.example
similarity index 100%
rename from programs/network/netsurf/netsurf/Makefile.config.example
rename to contrib/network/netsurf/netsurf/Makefile.config.example
diff --git a/programs/network/netsurf/netsurf/Makefile.defaults b/contrib/network/netsurf/netsurf/Makefile.defaults
similarity index 100%
rename from programs/network/netsurf/netsurf/Makefile.defaults
rename to contrib/network/netsurf/netsurf/Makefile.defaults
diff --git a/programs/network/netsurf/netsurf/Makefile.sources b/contrib/network/netsurf/netsurf/Makefile.sources
similarity index 100%
rename from programs/network/netsurf/netsurf/Makefile.sources
rename to contrib/network/netsurf/netsurf/Makefile.sources
diff --git a/programs/network/netsurf/netsurf/Makefile.sources.javascript b/contrib/network/netsurf/netsurf/Makefile.sources.javascript
similarity index 100%
rename from programs/network/netsurf/netsurf/Makefile.sources.javascript
rename to contrib/network/netsurf/netsurf/Makefile.sources.javascript
diff --git a/programs/network/netsurf/netsurf/TODO b/contrib/network/netsurf/netsurf/TODO
similarity index 100%
rename from programs/network/netsurf/netsurf/TODO
rename to contrib/network/netsurf/netsurf/TODO
diff --git a/programs/network/netsurf/netsurf/content/content.c b/contrib/network/netsurf/netsurf/content/content.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/content.c
rename to contrib/network/netsurf/netsurf/content/content.c
diff --git a/programs/network/netsurf/netsurf/content/content.h b/contrib/network/netsurf/netsurf/content/content.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/content.h
rename to contrib/network/netsurf/netsurf/content/content.h
diff --git a/programs/network/netsurf/netsurf/content/content_factory.c b/contrib/network/netsurf/netsurf/content/content_factory.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/content_factory.c
rename to contrib/network/netsurf/netsurf/content/content_factory.c
diff --git a/programs/network/netsurf/netsurf/content/content_factory.h b/contrib/network/netsurf/netsurf/content/content_factory.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/content_factory.h
rename to contrib/network/netsurf/netsurf/content/content_factory.h
diff --git a/programs/network/netsurf/netsurf/content/content_protected.h b/contrib/network/netsurf/netsurf/content/content_protected.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/content_protected.h
rename to contrib/network/netsurf/netsurf/content/content_protected.h
diff --git a/programs/network/netsurf/netsurf/content/content_type.h b/contrib/network/netsurf/netsurf/content/content_type.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/content_type.h
rename to contrib/network/netsurf/netsurf/content/content_type.h
diff --git a/programs/network/netsurf/netsurf/content/dirlist.c b/contrib/network/netsurf/netsurf/content/dirlist.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/dirlist.c
rename to contrib/network/netsurf/netsurf/content/dirlist.c
diff --git a/programs/network/netsurf/netsurf/content/dirlist.h b/contrib/network/netsurf/netsurf/content/dirlist.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/dirlist.h
rename to contrib/network/netsurf/netsurf/content/dirlist.h
diff --git a/programs/network/netsurf/netsurf/content/fetch.c b/contrib/network/netsurf/netsurf/content/fetch.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetch.c
rename to contrib/network/netsurf/netsurf/content/fetch.c
diff --git a/programs/network/netsurf/netsurf/content/fetch.h b/contrib/network/netsurf/netsurf/content/fetch.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetch.h
rename to contrib/network/netsurf/netsurf/content/fetch.h
diff --git a/programs/network/netsurf/netsurf/content/fetchers/about.c b/contrib/network/netsurf/netsurf/content/fetchers/about.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/about.c
rename to contrib/network/netsurf/netsurf/content/fetchers/about.c
diff --git a/programs/network/netsurf/netsurf/content/fetchers/about.h b/contrib/network/netsurf/netsurf/content/fetchers/about.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/about.h
rename to contrib/network/netsurf/netsurf/content/fetchers/about.h
diff --git a/programs/network/netsurf/netsurf/content/fetchers/curl.c b/contrib/network/netsurf/netsurf/content/fetchers/curl.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/curl.c
rename to contrib/network/netsurf/netsurf/content/fetchers/curl.c
diff --git a/programs/network/netsurf/netsurf/content/fetchers/curl.h b/contrib/network/netsurf/netsurf/content/fetchers/curl.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/curl.h
rename to contrib/network/netsurf/netsurf/content/fetchers/curl.h
diff --git a/programs/network/netsurf/netsurf/content/fetchers/data.c b/contrib/network/netsurf/netsurf/content/fetchers/data.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/data.c
rename to contrib/network/netsurf/netsurf/content/fetchers/data.c
diff --git a/programs/network/netsurf/netsurf/content/fetchers/data.h b/contrib/network/netsurf/netsurf/content/fetchers/data.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/data.h
rename to contrib/network/netsurf/netsurf/content/fetchers/data.h
diff --git a/programs/network/netsurf/netsurf/content/fetchers/file.c b/contrib/network/netsurf/netsurf/content/fetchers/file.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/file.c
rename to contrib/network/netsurf/netsurf/content/fetchers/file.c
diff --git a/programs/network/netsurf/netsurf/content/fetchers/file.h b/contrib/network/netsurf/netsurf/content/fetchers/file.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/file.h
rename to contrib/network/netsurf/netsurf/content/fetchers/file.h
diff --git a/programs/network/netsurf/netsurf/content/fetchers/http.c b/contrib/network/netsurf/netsurf/content/fetchers/http.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/http.c
rename to contrib/network/netsurf/netsurf/content/fetchers/http.c
diff --git a/programs/network/netsurf/netsurf/content/fetchers/make.fetch b/contrib/network/netsurf/netsurf/content/fetchers/make.fetch
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/make.fetch
rename to contrib/network/netsurf/netsurf/content/fetchers/make.fetch
diff --git a/programs/network/netsurf/netsurf/content/fetchers/resource.c b/contrib/network/netsurf/netsurf/content/fetchers/resource.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/resource.c
rename to contrib/network/netsurf/netsurf/content/fetchers/resource.c
diff --git a/programs/network/netsurf/netsurf/content/fetchers/resource.h b/contrib/network/netsurf/netsurf/content/fetchers/resource.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/fetchers/resource.h
rename to contrib/network/netsurf/netsurf/content/fetchers/resource.h
diff --git a/programs/network/netsurf/netsurf/content/hlcache.c b/contrib/network/netsurf/netsurf/content/hlcache.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/hlcache.c
rename to contrib/network/netsurf/netsurf/content/hlcache.c
diff --git a/programs/network/netsurf/netsurf/content/hlcache.h b/contrib/network/netsurf/netsurf/content/hlcache.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/hlcache.h
rename to contrib/network/netsurf/netsurf/content/hlcache.h
diff --git a/programs/network/netsurf/netsurf/content/llcache.c b/contrib/network/netsurf/netsurf/content/llcache.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/llcache.c
rename to contrib/network/netsurf/netsurf/content/llcache.c
diff --git a/programs/network/netsurf/netsurf/content/llcache.h b/contrib/network/netsurf/netsurf/content/llcache.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/llcache.h
rename to contrib/network/netsurf/netsurf/content/llcache.h
diff --git a/programs/network/netsurf/netsurf/content/make.content b/contrib/network/netsurf/netsurf/content/make.content
similarity index 100%
rename from programs/network/netsurf/netsurf/content/make.content
rename to contrib/network/netsurf/netsurf/content/make.content
diff --git a/programs/network/netsurf/netsurf/content/mimesniff.c b/contrib/network/netsurf/netsurf/content/mimesniff.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/mimesniff.c
rename to contrib/network/netsurf/netsurf/content/mimesniff.c
diff --git a/programs/network/netsurf/netsurf/content/mimesniff.h b/contrib/network/netsurf/netsurf/content/mimesniff.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/mimesniff.h
rename to contrib/network/netsurf/netsurf/content/mimesniff.h
diff --git a/programs/network/netsurf/netsurf/content/urldb.c b/contrib/network/netsurf/netsurf/content/urldb.c
similarity index 100%
rename from programs/network/netsurf/netsurf/content/urldb.c
rename to contrib/network/netsurf/netsurf/content/urldb.c
diff --git a/programs/network/netsurf/netsurf/content/urldb.h b/contrib/network/netsurf/netsurf/content/urldb.h
similarity index 100%
rename from programs/network/netsurf/netsurf/content/urldb.h
rename to contrib/network/netsurf/netsurf/content/urldb.h
diff --git a/programs/network/netsurf/netsurf/css/css.c b/contrib/network/netsurf/netsurf/css/css.c
similarity index 100%
rename from programs/network/netsurf/netsurf/css/css.c
rename to contrib/network/netsurf/netsurf/css/css.c
diff --git a/programs/network/netsurf/netsurf/css/css.h b/contrib/network/netsurf/netsurf/css/css.h
similarity index 100%
rename from programs/network/netsurf/netsurf/css/css.h
rename to contrib/network/netsurf/netsurf/css/css.h
diff --git a/programs/network/netsurf/netsurf/css/dump.c b/contrib/network/netsurf/netsurf/css/dump.c
similarity index 100%
rename from programs/network/netsurf/netsurf/css/dump.c
rename to contrib/network/netsurf/netsurf/css/dump.c
diff --git a/programs/network/netsurf/netsurf/css/dump.h b/contrib/network/netsurf/netsurf/css/dump.h
similarity index 100%
rename from programs/network/netsurf/netsurf/css/dump.h
rename to contrib/network/netsurf/netsurf/css/dump.h
diff --git a/programs/network/netsurf/netsurf/css/internal.c b/contrib/network/netsurf/netsurf/css/internal.c
similarity index 100%
rename from programs/network/netsurf/netsurf/css/internal.c
rename to contrib/network/netsurf/netsurf/css/internal.c
diff --git a/programs/network/netsurf/netsurf/css/internal.h b/contrib/network/netsurf/netsurf/css/internal.h
similarity index 100%
rename from programs/network/netsurf/netsurf/css/internal.h
rename to contrib/network/netsurf/netsurf/css/internal.h
diff --git a/programs/network/netsurf/netsurf/css/make.css b/contrib/network/netsurf/netsurf/css/make.css
similarity index 100%
rename from programs/network/netsurf/netsurf/css/make.css
rename to contrib/network/netsurf/netsurf/css/make.css
diff --git a/programs/network/netsurf/netsurf/css/select.c b/contrib/network/netsurf/netsurf/css/select.c
similarity index 100%
rename from programs/network/netsurf/netsurf/css/select.c
rename to contrib/network/netsurf/netsurf/css/select.c
diff --git a/programs/network/netsurf/netsurf/css/select.h b/contrib/network/netsurf/netsurf/css/select.h
similarity index 100%
rename from programs/network/netsurf/netsurf/css/select.h
rename to contrib/network/netsurf/netsurf/css/select.h
diff --git a/programs/network/netsurf/netsurf/css/utils.c b/contrib/network/netsurf/netsurf/css/utils.c
similarity index 100%
rename from programs/network/netsurf/netsurf/css/utils.c
rename to contrib/network/netsurf/netsurf/css/utils.c
diff --git a/programs/network/netsurf/netsurf/css/utils.h b/contrib/network/netsurf/netsurf/css/utils.h
similarity index 100%
rename from programs/network/netsurf/netsurf/css/utils.h
rename to contrib/network/netsurf/netsurf/css/utils.h
diff --git a/programs/network/netsurf/netsurf/desktop/401login.h b/contrib/network/netsurf/netsurf/desktop/401login.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/401login.h
rename to contrib/network/netsurf/netsurf/desktop/401login.h
diff --git a/programs/network/netsurf/netsurf/desktop/browser.c b/contrib/network/netsurf/netsurf/desktop/browser.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/browser.c
rename to contrib/network/netsurf/netsurf/desktop/browser.c
diff --git a/programs/network/netsurf/netsurf/desktop/browser.h b/contrib/network/netsurf/netsurf/desktop/browser.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/browser.h
rename to contrib/network/netsurf/netsurf/desktop/browser.h
diff --git a/programs/network/netsurf/netsurf/desktop/browser_private.h b/contrib/network/netsurf/netsurf/desktop/browser_private.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/browser_private.h
rename to contrib/network/netsurf/netsurf/desktop/browser_private.h
diff --git a/programs/network/netsurf/netsurf/desktop/cookies.c b/contrib/network/netsurf/netsurf/desktop/cookies.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/cookies.c
rename to contrib/network/netsurf/netsurf/desktop/cookies.c
diff --git a/programs/network/netsurf/netsurf/desktop/cookies.h b/contrib/network/netsurf/netsurf/desktop/cookies.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/cookies.h
rename to contrib/network/netsurf/netsurf/desktop/cookies.h
diff --git a/programs/network/netsurf/netsurf/desktop/download.c b/contrib/network/netsurf/netsurf/desktop/download.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/download.c
rename to contrib/network/netsurf/netsurf/desktop/download.c
diff --git a/programs/network/netsurf/netsurf/desktop/download.h b/contrib/network/netsurf/netsurf/desktop/download.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/download.h
rename to contrib/network/netsurf/netsurf/desktop/download.h
diff --git a/programs/network/netsurf/netsurf/desktop/frame_types.h b/contrib/network/netsurf/netsurf/desktop/frame_types.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/frame_types.h
rename to contrib/network/netsurf/netsurf/desktop/frame_types.h
diff --git a/programs/network/netsurf/netsurf/desktop/frames.c b/contrib/network/netsurf/netsurf/desktop/frames.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/frames.c
rename to contrib/network/netsurf/netsurf/desktop/frames.c
diff --git a/programs/network/netsurf/netsurf/desktop/frames.h b/contrib/network/netsurf/netsurf/desktop/frames.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/frames.h
rename to contrib/network/netsurf/netsurf/desktop/frames.h
diff --git a/programs/network/netsurf/netsurf/desktop/gui.h b/contrib/network/netsurf/netsurf/desktop/gui.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/gui.h
rename to contrib/network/netsurf/netsurf/desktop/gui.h
diff --git a/programs/network/netsurf/netsurf/desktop/history_core.c b/contrib/network/netsurf/netsurf/desktop/history_core.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/history_core.c
rename to contrib/network/netsurf/netsurf/desktop/history_core.c
diff --git a/programs/network/netsurf/netsurf/desktop/history_core.h b/contrib/network/netsurf/netsurf/desktop/history_core.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/history_core.h
rename to contrib/network/netsurf/netsurf/desktop/history_core.h
diff --git a/programs/network/netsurf/netsurf/desktop/history_global_core.c b/contrib/network/netsurf/netsurf/desktop/history_global_core.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/history_global_core.c
rename to contrib/network/netsurf/netsurf/desktop/history_global_core.c
diff --git a/programs/network/netsurf/netsurf/desktop/history_global_core.h b/contrib/network/netsurf/netsurf/desktop/history_global_core.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/history_global_core.h
rename to contrib/network/netsurf/netsurf/desktop/history_global_core.h
diff --git a/programs/network/netsurf/netsurf/desktop/hotlist.c b/contrib/network/netsurf/netsurf/desktop/hotlist.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/hotlist.c
rename to contrib/network/netsurf/netsurf/desktop/hotlist.c
diff --git a/programs/network/netsurf/netsurf/desktop/hotlist.h b/contrib/network/netsurf/netsurf/desktop/hotlist.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/hotlist.h
rename to contrib/network/netsurf/netsurf/desktop/hotlist.h
diff --git a/programs/network/netsurf/netsurf/desktop/knockout.c b/contrib/network/netsurf/netsurf/desktop/knockout.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/knockout.c
rename to contrib/network/netsurf/netsurf/desktop/knockout.c
diff --git a/programs/network/netsurf/netsurf/desktop/knockout.h b/contrib/network/netsurf/netsurf/desktop/knockout.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/knockout.h
rename to contrib/network/netsurf/netsurf/desktop/knockout.h
diff --git a/programs/network/netsurf/netsurf/desktop/make.browser b/contrib/network/netsurf/netsurf/desktop/make.browser
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/make.browser
rename to contrib/network/netsurf/netsurf/desktop/make.browser
diff --git a/programs/network/netsurf/netsurf/desktop/make.desktop b/contrib/network/netsurf/netsurf/desktop/make.desktop
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/make.desktop
rename to contrib/network/netsurf/netsurf/desktop/make.desktop
diff --git a/programs/network/netsurf/netsurf/desktop/mouse.c b/contrib/network/netsurf/netsurf/desktop/mouse.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/mouse.c
rename to contrib/network/netsurf/netsurf/desktop/mouse.c
diff --git a/programs/network/netsurf/netsurf/desktop/mouse.h b/contrib/network/netsurf/netsurf/desktop/mouse.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/mouse.h
rename to contrib/network/netsurf/netsurf/desktop/mouse.h
diff --git a/programs/network/netsurf/netsurf/desktop/netsurf.c b/contrib/network/netsurf/netsurf/desktop/netsurf.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/netsurf.c
rename to contrib/network/netsurf/netsurf/desktop/netsurf.c
diff --git a/programs/network/netsurf/netsurf/desktop/netsurf.h b/contrib/network/netsurf/netsurf/desktop/netsurf.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/netsurf.h
rename to contrib/network/netsurf/netsurf/desktop/netsurf.h
diff --git a/programs/network/netsurf/netsurf/desktop/options.c b/contrib/network/netsurf/netsurf/desktop/options.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/options.c
rename to contrib/network/netsurf/netsurf/desktop/options.c
diff --git a/programs/network/netsurf/netsurf/desktop/options.h b/contrib/network/netsurf/netsurf/desktop/options.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/options.h
rename to contrib/network/netsurf/netsurf/desktop/options.h
diff --git a/programs/network/netsurf/netsurf/desktop/options_main.h b/contrib/network/netsurf/netsurf/desktop/options_main.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/options_main.h
rename to contrib/network/netsurf/netsurf/desktop/options_main.h
diff --git a/programs/network/netsurf/netsurf/desktop/plot_style.c b/contrib/network/netsurf/netsurf/desktop/plot_style.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/plot_style.c
rename to contrib/network/netsurf/netsurf/desktop/plot_style.c
diff --git a/programs/network/netsurf/netsurf/desktop/plot_style.h b/contrib/network/netsurf/netsurf/desktop/plot_style.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/plot_style.h
rename to contrib/network/netsurf/netsurf/desktop/plot_style.h
diff --git a/programs/network/netsurf/netsurf/desktop/plotters.h b/contrib/network/netsurf/netsurf/desktop/plotters.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/plotters.h
rename to contrib/network/netsurf/netsurf/desktop/plotters.h
diff --git a/programs/network/netsurf/netsurf/desktop/print.c b/contrib/network/netsurf/netsurf/desktop/print.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/print.c
rename to contrib/network/netsurf/netsurf/desktop/print.c
diff --git a/programs/network/netsurf/netsurf/desktop/print.h b/contrib/network/netsurf/netsurf/desktop/print.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/print.h
rename to contrib/network/netsurf/netsurf/desktop/print.h
diff --git a/programs/network/netsurf/netsurf/desktop/printer.h b/contrib/network/netsurf/netsurf/desktop/printer.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/printer.h
rename to contrib/network/netsurf/netsurf/desktop/printer.h
diff --git a/programs/network/netsurf/netsurf/desktop/save_complete.c b/contrib/network/netsurf/netsurf/desktop/save_complete.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_complete.c
rename to contrib/network/netsurf/netsurf/desktop/save_complete.c
diff --git a/programs/network/netsurf/netsurf/desktop/save_complete.h b/contrib/network/netsurf/netsurf/desktop/save_complete.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_complete.h
rename to contrib/network/netsurf/netsurf/desktop/save_complete.h
diff --git a/programs/network/netsurf/netsurf/desktop/save_pdf/TODO b/contrib/network/netsurf/netsurf/desktop/save_pdf/TODO
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_pdf/TODO
rename to contrib/network/netsurf/netsurf/desktop/save_pdf/TODO
diff --git a/programs/network/netsurf/netsurf/desktop/save_pdf/font_haru.c b/contrib/network/netsurf/netsurf/desktop/save_pdf/font_haru.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_pdf/font_haru.c
rename to contrib/network/netsurf/netsurf/desktop/save_pdf/font_haru.c
diff --git a/programs/network/netsurf/netsurf/desktop/save_pdf/font_haru.h b/contrib/network/netsurf/netsurf/desktop/save_pdf/font_haru.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_pdf/font_haru.h
rename to contrib/network/netsurf/netsurf/desktop/save_pdf/font_haru.h
diff --git a/programs/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.c b/contrib/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.c
rename to contrib/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.c
diff --git a/programs/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.h b/contrib/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.h
rename to contrib/network/netsurf/netsurf/desktop/save_pdf/pdf_plotters.h
diff --git a/programs/network/netsurf/netsurf/desktop/save_text.c b/contrib/network/netsurf/netsurf/desktop/save_text.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_text.c
rename to contrib/network/netsurf/netsurf/desktop/save_text.c
diff --git a/programs/network/netsurf/netsurf/desktop/save_text.h b/contrib/network/netsurf/netsurf/desktop/save_text.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/save_text.h
rename to contrib/network/netsurf/netsurf/desktop/save_text.h
diff --git a/programs/network/netsurf/netsurf/desktop/scrollbar.c b/contrib/network/netsurf/netsurf/desktop/scrollbar.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/scrollbar.c
rename to contrib/network/netsurf/netsurf/desktop/scrollbar.c
diff --git a/programs/network/netsurf/netsurf/desktop/scrollbar.h b/contrib/network/netsurf/netsurf/desktop/scrollbar.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/scrollbar.h
rename to contrib/network/netsurf/netsurf/desktop/scrollbar.h
diff --git a/programs/network/netsurf/netsurf/desktop/search.c b/contrib/network/netsurf/netsurf/desktop/search.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/search.c
rename to contrib/network/netsurf/netsurf/desktop/search.c
diff --git a/programs/network/netsurf/netsurf/desktop/search.h b/contrib/network/netsurf/netsurf/desktop/search.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/search.h
rename to contrib/network/netsurf/netsurf/desktop/search.h
diff --git a/programs/network/netsurf/netsurf/desktop/searchweb.c b/contrib/network/netsurf/netsurf/desktop/searchweb.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/searchweb.c
rename to contrib/network/netsurf/netsurf/desktop/searchweb.c
diff --git a/programs/network/netsurf/netsurf/desktop/searchweb.h b/contrib/network/netsurf/netsurf/desktop/searchweb.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/searchweb.h
rename to contrib/network/netsurf/netsurf/desktop/searchweb.h
diff --git a/programs/network/netsurf/netsurf/desktop/selection.c b/contrib/network/netsurf/netsurf/desktop/selection.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/selection.c
rename to contrib/network/netsurf/netsurf/desktop/selection.c
diff --git a/programs/network/netsurf/netsurf/desktop/selection.h b/contrib/network/netsurf/netsurf/desktop/selection.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/selection.h
rename to contrib/network/netsurf/netsurf/desktop/selection.h
diff --git a/programs/network/netsurf/netsurf/desktop/sslcert.c b/contrib/network/netsurf/netsurf/desktop/sslcert.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/sslcert.c
rename to contrib/network/netsurf/netsurf/desktop/sslcert.c
diff --git a/programs/network/netsurf/netsurf/desktop/sslcert.h b/contrib/network/netsurf/netsurf/desktop/sslcert.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/sslcert.h
rename to contrib/network/netsurf/netsurf/desktop/sslcert.h
diff --git a/programs/network/netsurf/netsurf/desktop/textarea.c b/contrib/network/netsurf/netsurf/desktop/textarea.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/textarea.c
rename to contrib/network/netsurf/netsurf/desktop/textarea.c
diff --git a/programs/network/netsurf/netsurf/desktop/textarea.h b/contrib/network/netsurf/netsurf/desktop/textarea.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/textarea.h
rename to contrib/network/netsurf/netsurf/desktop/textarea.h
diff --git a/programs/network/netsurf/netsurf/desktop/textinput.c b/contrib/network/netsurf/netsurf/desktop/textinput.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/textinput.c
rename to contrib/network/netsurf/netsurf/desktop/textinput.c
diff --git a/programs/network/netsurf/netsurf/desktop/textinput.h b/contrib/network/netsurf/netsurf/desktop/textinput.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/textinput.h
rename to contrib/network/netsurf/netsurf/desktop/textinput.h
diff --git a/programs/network/netsurf/netsurf/desktop/thumbnail.c b/contrib/network/netsurf/netsurf/desktop/thumbnail.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/thumbnail.c
rename to contrib/network/netsurf/netsurf/desktop/thumbnail.c
diff --git a/programs/network/netsurf/netsurf/desktop/thumbnail.h b/contrib/network/netsurf/netsurf/desktop/thumbnail.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/thumbnail.h
rename to contrib/network/netsurf/netsurf/desktop/thumbnail.h
diff --git a/programs/network/netsurf/netsurf/desktop/tree.c b/contrib/network/netsurf/netsurf/desktop/tree.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/tree.c
rename to contrib/network/netsurf/netsurf/desktop/tree.c
diff --git a/programs/network/netsurf/netsurf/desktop/tree.h b/contrib/network/netsurf/netsurf/desktop/tree.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/tree.h
rename to contrib/network/netsurf/netsurf/desktop/tree.h
diff --git a/programs/network/netsurf/netsurf/desktop/tree_url_node.c b/contrib/network/netsurf/netsurf/desktop/tree_url_node.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/tree_url_node.c
rename to contrib/network/netsurf/netsurf/desktop/tree_url_node.c
diff --git a/programs/network/netsurf/netsurf/desktop/tree_url_node.h b/contrib/network/netsurf/netsurf/desktop/tree_url_node.h
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/tree_url_node.h
rename to contrib/network/netsurf/netsurf/desktop/tree_url_node.h
diff --git a/programs/network/netsurf/netsurf/desktop/version.c b/contrib/network/netsurf/netsurf/desktop/version.c
similarity index 100%
rename from programs/network/netsurf/netsurf/desktop/version.c
rename to contrib/network/netsurf/netsurf/desktop/version.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/bitmap.c b/contrib/network/netsurf/netsurf/framebuffer/bitmap.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/bitmap.c
rename to contrib/network/netsurf/netsurf/framebuffer/bitmap.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/clipboard.c b/contrib/network/netsurf/netsurf/framebuffer/clipboard.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/clipboard.c
rename to contrib/network/netsurf/netsurf/framebuffer/clipboard.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/convert_image.c b/contrib/network/netsurf/netsurf/framebuffer/convert_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/convert_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/convert_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fb_search.c b/contrib/network/netsurf/netsurf/framebuffer/fb_search.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fb_search.c
rename to contrib/network/netsurf/netsurf/framebuffer/fb_search.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk.h b/contrib/network/netsurf/netsurf/framebuffer/fbtk.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk.h
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/bitmap.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/bitmap.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/bitmap.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/bitmap.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/event.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/event.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/event.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/event.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/fill.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/fill.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/fill.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/fill.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/make.fbtk b/contrib/network/netsurf/netsurf/framebuffer/fbtk/make.fbtk
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/make.fbtk
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/make.fbtk
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/osk.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/osk.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/osk.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/osk.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/scroll.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/scroll.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/scroll.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/scroll.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/text.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/text.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/text.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/text.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/user.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/user.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/user.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/user.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/widget.h b/contrib/network/netsurf/netsurf/framebuffer/fbtk/widget.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/widget.h
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/widget.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/fbtk/window.c b/contrib/network/netsurf/netsurf/framebuffer/fbtk/window.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/fbtk/window.c
rename to contrib/network/netsurf/netsurf/framebuffer/fbtk/window.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/filetype.c b/contrib/network/netsurf/netsurf/framebuffer/filetype.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/filetype.c
rename to contrib/network/netsurf/netsurf/framebuffer/filetype.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/findfile.c b/contrib/network/netsurf/netsurf/framebuffer/findfile.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/findfile.c
rename to contrib/network/netsurf/netsurf/framebuffer/findfile.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/findfile.h b/contrib/network/netsurf/netsurf/framebuffer/findfile.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/findfile.h
rename to contrib/network/netsurf/netsurf/framebuffer/findfile.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/font.h b/contrib/network/netsurf/netsurf/framebuffer/font.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/font.h
rename to contrib/network/netsurf/netsurf/framebuffer/font.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/font_freetype.c b/contrib/network/netsurf/netsurf/framebuffer/font_freetype.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/font_freetype.c
rename to contrib/network/netsurf/netsurf/framebuffer/font_freetype.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/font_freetype.h b/contrib/network/netsurf/netsurf/framebuffer/font_freetype.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/font_freetype.h
rename to contrib/network/netsurf/netsurf/framebuffer/font_freetype.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/font_internal.c b/contrib/network/netsurf/netsurf/framebuffer/font_internal.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/font_internal.c
rename to contrib/network/netsurf/netsurf/framebuffer/font_internal.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/font_internal.h b/contrib/network/netsurf/netsurf/framebuffer/font_internal.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/font_internal.h
rename to contrib/network/netsurf/netsurf/framebuffer/font_internal.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/framebuffer.c b/contrib/network/netsurf/netsurf/framebuffer/framebuffer.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/framebuffer.c
rename to contrib/network/netsurf/netsurf/framebuffer/framebuffer.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/framebuffer.h b/contrib/network/netsurf/netsurf/framebuffer/framebuffer.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/framebuffer.h
rename to contrib/network/netsurf/netsurf/framebuffer/framebuffer.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/gui.c b/contrib/network/netsurf/netsurf/framebuffer/gui.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/gui.c
rename to contrib/network/netsurf/netsurf/framebuffer/gui.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/gui.h b/contrib/network/netsurf/netsurf/framebuffer/gui.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/gui.h
rename to contrib/network/netsurf/netsurf/framebuffer/gui.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/image_data.h b/contrib/network/netsurf/netsurf/framebuffer/image_data.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/image_data.h
rename to contrib/network/netsurf/netsurf/framebuffer/image_data.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/caret_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/caret_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/caret_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/caret_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/hand_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/hand_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/hand_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/hand_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/history_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/history_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/history_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/history_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/history_image_g.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/history_image_g.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/history_image_g.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/history_image_g.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/left_arrow.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/left_arrow.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/left_arrow.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/left_arrow.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/left_arrow_g.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/left_arrow_g.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/left_arrow_g.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/left_arrow_g.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/make.res b/contrib/network/netsurf/netsurf/framebuffer/imgs/make.res
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/make.res
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/make.res
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/menu_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/menu_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/menu_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/menu_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/move_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/move_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/move_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/move_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/osk_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/osk_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/osk_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/osk_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/pointer_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/pointer_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/pointer_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/pointer_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/progress_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/progress_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/progress_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/progress_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/reload.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/reload.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/reload.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/reload.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/reload_g.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/reload_g.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/reload_g.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/reload_g.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/right_arrow.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/right_arrow.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/right_arrow.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/right_arrow.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/right_arrow_g.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/right_arrow_g.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/right_arrow_g.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/right_arrow_g.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/scrolld.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/scrolld.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/scrolld.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/scrolld.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/scrolll.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/scrolll.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/scrolll.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/scrolll.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/scrollr.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/scrollr.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/scrollr.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/scrollr.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/scrollu.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/scrollu.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/scrollu.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/scrollu.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/stop_image.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/stop_image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/stop_image.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/stop_image.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/stop_image_g.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/stop_image_g.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/stop_image_g.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/stop_image_g.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber0.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber0.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber0.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber0.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber1.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber1.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber1.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber1.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber2.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber2.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber2.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber2.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber3.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber3.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber3.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber3.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber4.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber4.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber4.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber4.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber5.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber5.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber5.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber5.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber6.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber6.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber6.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber6.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber7.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber7.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber7.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber7.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/imgs/throbber8.c b/contrib/network/netsurf/netsurf/framebuffer/imgs/throbber8.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/imgs/throbber8.c
rename to contrib/network/netsurf/netsurf/framebuffer/imgs/throbber8.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/localhistory.c b/contrib/network/netsurf/netsurf/framebuffer/localhistory.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/localhistory.c
rename to contrib/network/netsurf/netsurf/framebuffer/localhistory.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/login.c b/contrib/network/netsurf/netsurf/framebuffer/login.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/login.c
rename to contrib/network/netsurf/netsurf/framebuffer/login.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/make.fb b/contrib/network/netsurf/netsurf/framebuffer/make.fb
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/make.fb
rename to contrib/network/netsurf/netsurf/framebuffer/make.fb
diff --git a/programs/network/netsurf/netsurf/framebuffer/misc.c b/contrib/network/netsurf/netsurf/framebuffer/misc.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/misc.c
rename to contrib/network/netsurf/netsurf/framebuffer/misc.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/nsfont_bold.c b/contrib/network/netsurf/netsurf/framebuffer/nsfont_bold.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/nsfont_bold.c
rename to contrib/network/netsurf/netsurf/framebuffer/nsfont_bold.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/nsfont_italic.c b/contrib/network/netsurf/netsurf/framebuffer/nsfont_italic.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/nsfont_italic.c
rename to contrib/network/netsurf/netsurf/framebuffer/nsfont_italic.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/nsfont_italic_bold.c b/contrib/network/netsurf/netsurf/framebuffer/nsfont_italic_bold.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/nsfont_italic_bold.c
rename to contrib/network/netsurf/netsurf/framebuffer/nsfont_italic_bold.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/nsfont_regular.c b/contrib/network/netsurf/netsurf/framebuffer/nsfont_regular.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/nsfont_regular.c
rename to contrib/network/netsurf/netsurf/framebuffer/nsfont_regular.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/options.h b/contrib/network/netsurf/netsurf/framebuffer/options.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/options.h
rename to contrib/network/netsurf/netsurf/framebuffer/options.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/adblock.css b/contrib/network/netsurf/netsurf/framebuffer/res/adblock.css
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/adblock.css
rename to contrib/network/netsurf/netsurf/framebuffer/res/adblock.css
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/credits.html b/contrib/network/netsurf/netsurf/framebuffer/res/credits.html
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/credits.html
rename to contrib/network/netsurf/netsurf/framebuffer/res/credits.html
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/default.css b/contrib/network/netsurf/netsurf/framebuffer/res/default.css
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/default.css
rename to contrib/network/netsurf/netsurf/framebuffer/res/default.css
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/favicon.png b/contrib/network/netsurf/netsurf/framebuffer/res/favicon.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/favicon.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/favicon.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/back.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/back.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/back.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/back.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/back_g.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/back_g.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/back_g.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/back_g.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/forward.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/forward.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/forward.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/forward.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/forward_g.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/forward_g.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/forward_g.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/forward_g.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/history.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/history.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/history.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/history.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/history_g.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/history_g.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/history_g.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/history_g.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/home.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/home.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/home.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/home.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/home_g.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/home_g.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/home_g.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/home_g.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/osk.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/osk.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/osk.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/osk.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/reload.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/reload.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/reload.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/reload.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/reload_g.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/reload_g.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/reload_g.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/reload_g.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/scrolld.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/scrolld.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/scrolld.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/scrolld.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/scrolll.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/scrolll.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/scrolll.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/scrolll.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/scrollr.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/scrollr.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/scrollr.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/scrollr.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/scrollu.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/scrollu.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/scrollu.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/scrollu.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/stop.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/stop.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/stop.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/stop.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/icons/stop_g.png b/contrib/network/netsurf/netsurf/framebuffer/res/icons/stop_g.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/icons/stop_g.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/icons/stop_g.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/internal.css b/contrib/network/netsurf/netsurf/framebuffer/res/internal.css
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/internal.css
rename to contrib/network/netsurf/netsurf/framebuffer/res/internal.css
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/licence.html b/contrib/network/netsurf/netsurf/framebuffer/res/licence.html
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/licence.html
rename to contrib/network/netsurf/netsurf/framebuffer/res/licence.html
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/messages b/contrib/network/netsurf/netsurf/framebuffer/res/messages
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/messages
rename to contrib/network/netsurf/netsurf/framebuffer/res/messages
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/netsurf.png b/contrib/network/netsurf/netsurf/framebuffer/res/netsurf.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/netsurf.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/netsurf.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/caret.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/caret.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/caret.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/caret.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/cross.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/cross.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/cross.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/cross.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/default.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/default.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/default.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/default.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/help.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/help.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/help.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/help.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/left-right.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/left-right.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/left-right.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/left-right.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/lu-rd.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/lu-rd.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/lu-rd.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/lu-rd.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/menu.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/menu.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/menu.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/menu.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/move.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/move.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/move.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/move.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/no_drop.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/no_drop.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/no_drop.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/no_drop.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/not_allowed.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/not_allowed.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/not_allowed.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/not_allowed.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/point.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/point.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/point.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/point.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/progress.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/progress.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/progress.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/progress.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/ru-ld.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/ru-ld.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/ru-ld.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/ru-ld.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/up-down.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/up-down.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/up-down.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/up-down.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/pointers/wait.png b/contrib/network/netsurf/netsurf/framebuffer/res/pointers/wait.png
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/pointers/wait.png
rename to contrib/network/netsurf/netsurf/framebuffer/res/pointers/wait.png
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/quirks.css b/contrib/network/netsurf/netsurf/framebuffer/res/quirks.css
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/quirks.css
rename to contrib/network/netsurf/netsurf/framebuffer/res/quirks.css
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/throbber b/contrib/network/netsurf/netsurf/framebuffer/res/throbber
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/throbber
rename to contrib/network/netsurf/netsurf/framebuffer/res/throbber
diff --git a/programs/network/netsurf/netsurf/framebuffer/res/welcome.html b/contrib/network/netsurf/netsurf/framebuffer/res/welcome.html
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/res/welcome.html
rename to contrib/network/netsurf/netsurf/framebuffer/res/welcome.html
diff --git a/programs/network/netsurf/netsurf/framebuffer/schedule.c b/contrib/network/netsurf/netsurf/framebuffer/schedule.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/schedule.c
rename to contrib/network/netsurf/netsurf/framebuffer/schedule.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/schedule.h b/contrib/network/netsurf/netsurf/framebuffer/schedule.h
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/schedule.h
rename to contrib/network/netsurf/netsurf/framebuffer/schedule.h
diff --git a/programs/network/netsurf/netsurf/framebuffer/system_colour.c b/contrib/network/netsurf/netsurf/framebuffer/system_colour.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/system_colour.c
rename to contrib/network/netsurf/netsurf/framebuffer/system_colour.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/thumbnail.c b/contrib/network/netsurf/netsurf/framebuffer/thumbnail.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/thumbnail.c
rename to contrib/network/netsurf/netsurf/framebuffer/thumbnail.c
diff --git a/programs/network/netsurf/netsurf/framebuffer/tree.c b/contrib/network/netsurf/netsurf/framebuffer/tree.c
similarity index 100%
rename from programs/network/netsurf/netsurf/framebuffer/tree.c
rename to contrib/network/netsurf/netsurf/framebuffer/tree.c
diff --git a/programs/network/netsurf/netsurf/image/bitmap.h b/contrib/network/netsurf/netsurf/image/bitmap.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/bitmap.h
rename to contrib/network/netsurf/netsurf/image/bitmap.h
diff --git a/programs/network/netsurf/netsurf/image/bmp.c b/contrib/network/netsurf/netsurf/image/bmp.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/bmp.c
rename to contrib/network/netsurf/netsurf/image/bmp.c
diff --git a/programs/network/netsurf/netsurf/image/bmp.h b/contrib/network/netsurf/netsurf/image/bmp.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/bmp.h
rename to contrib/network/netsurf/netsurf/image/bmp.h
diff --git a/programs/network/netsurf/netsurf/image/gif.c b/contrib/network/netsurf/netsurf/image/gif.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/gif.c
rename to contrib/network/netsurf/netsurf/image/gif.c
diff --git a/programs/network/netsurf/netsurf/image/gif.h b/contrib/network/netsurf/netsurf/image/gif.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/gif.h
rename to contrib/network/netsurf/netsurf/image/gif.h
diff --git a/programs/network/netsurf/netsurf/image/ico.c b/contrib/network/netsurf/netsurf/image/ico.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/ico.c
rename to contrib/network/netsurf/netsurf/image/ico.c
diff --git a/programs/network/netsurf/netsurf/image/ico.h b/contrib/network/netsurf/netsurf/image/ico.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/ico.h
rename to contrib/network/netsurf/netsurf/image/ico.h
diff --git a/programs/network/netsurf/netsurf/image/image.c b/contrib/network/netsurf/netsurf/image/image.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/image.c
rename to contrib/network/netsurf/netsurf/image/image.c
diff --git a/programs/network/netsurf/netsurf/image/image.h b/contrib/network/netsurf/netsurf/image/image.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/image.h
rename to contrib/network/netsurf/netsurf/image/image.h
diff --git a/programs/network/netsurf/netsurf/image/image_cache.c b/contrib/network/netsurf/netsurf/image/image_cache.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/image_cache.c
rename to contrib/network/netsurf/netsurf/image/image_cache.c
diff --git a/programs/network/netsurf/netsurf/image/image_cache.h b/contrib/network/netsurf/netsurf/image/image_cache.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/image_cache.h
rename to contrib/network/netsurf/netsurf/image/image_cache.h
diff --git a/programs/network/netsurf/netsurf/image/jpeg.c b/contrib/network/netsurf/netsurf/image/jpeg.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/jpeg.c
rename to contrib/network/netsurf/netsurf/image/jpeg.c
diff --git a/programs/network/netsurf/netsurf/image/jpeg.h b/contrib/network/netsurf/netsurf/image/jpeg.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/jpeg.h
rename to contrib/network/netsurf/netsurf/image/jpeg.h
diff --git a/programs/network/netsurf/netsurf/image/make.image b/contrib/network/netsurf/netsurf/image/make.image
similarity index 100%
rename from programs/network/netsurf/netsurf/image/make.image
rename to contrib/network/netsurf/netsurf/image/make.image
diff --git a/programs/network/netsurf/netsurf/image/mng.c b/contrib/network/netsurf/netsurf/image/mng.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/mng.c
rename to contrib/network/netsurf/netsurf/image/mng.c
diff --git a/programs/network/netsurf/netsurf/image/mng.h b/contrib/network/netsurf/netsurf/image/mng.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/mng.h
rename to contrib/network/netsurf/netsurf/image/mng.h
diff --git a/programs/network/netsurf/netsurf/image/nssprite.c b/contrib/network/netsurf/netsurf/image/nssprite.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/nssprite.c
rename to contrib/network/netsurf/netsurf/image/nssprite.c
diff --git a/programs/network/netsurf/netsurf/image/nssprite.h b/contrib/network/netsurf/netsurf/image/nssprite.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/nssprite.h
rename to contrib/network/netsurf/netsurf/image/nssprite.h
diff --git a/programs/network/netsurf/netsurf/image/png.c b/contrib/network/netsurf/netsurf/image/png.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/png.c
rename to contrib/network/netsurf/netsurf/image/png.c
diff --git a/programs/network/netsurf/netsurf/image/png.h b/contrib/network/netsurf/netsurf/image/png.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/png.h
rename to contrib/network/netsurf/netsurf/image/png.h
diff --git a/programs/network/netsurf/netsurf/image/rsvg.c b/contrib/network/netsurf/netsurf/image/rsvg.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/rsvg.c
rename to contrib/network/netsurf/netsurf/image/rsvg.c
diff --git a/programs/network/netsurf/netsurf/image/rsvg.h b/contrib/network/netsurf/netsurf/image/rsvg.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/rsvg.h
rename to contrib/network/netsurf/netsurf/image/rsvg.h
diff --git a/programs/network/netsurf/netsurf/image/svg.c b/contrib/network/netsurf/netsurf/image/svg.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/svg.c
rename to contrib/network/netsurf/netsurf/image/svg.c
diff --git a/programs/network/netsurf/netsurf/image/svg.h b/contrib/network/netsurf/netsurf/image/svg.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/svg.h
rename to contrib/network/netsurf/netsurf/image/svg.h
diff --git a/programs/network/netsurf/netsurf/image/video.c b/contrib/network/netsurf/netsurf/image/video.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/video.c
rename to contrib/network/netsurf/netsurf/image/video.c
diff --git a/programs/network/netsurf/netsurf/image/video.h b/contrib/network/netsurf/netsurf/image/video.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/video.h
rename to contrib/network/netsurf/netsurf/image/video.h
diff --git a/programs/network/netsurf/netsurf/image/webp.c b/contrib/network/netsurf/netsurf/image/webp.c
similarity index 100%
rename from programs/network/netsurf/netsurf/image/webp.c
rename to contrib/network/netsurf/netsurf/image/webp.c
diff --git a/programs/network/netsurf/netsurf/image/webp.h b/contrib/network/netsurf/netsurf/image/webp.h
similarity index 100%
rename from programs/network/netsurf/netsurf/image/webp.h
rename to contrib/network/netsurf/netsurf/image/webp.h
diff --git a/programs/network/netsurf/netsurf/javascript/WebIDL/Makefile b/contrib/network/netsurf/netsurf/javascript/WebIDL/Makefile
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/WebIDL/Makefile
rename to contrib/network/netsurf/netsurf/javascript/WebIDL/Makefile
diff --git a/programs/network/netsurf/netsurf/javascript/WebIDL/console.idl b/contrib/network/netsurf/netsurf/javascript/WebIDL/console.idl
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/WebIDL/console.idl
rename to contrib/network/netsurf/netsurf/javascript/WebIDL/console.idl
diff --git a/programs/network/netsurf/netsurf/javascript/WebIDL/dom.idl b/contrib/network/netsurf/netsurf/javascript/WebIDL/dom.idl
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/WebIDL/dom.idl
rename to contrib/network/netsurf/netsurf/javascript/WebIDL/dom.idl
diff --git a/programs/network/netsurf/netsurf/javascript/WebIDL/html.idl b/contrib/network/netsurf/netsurf/javascript/WebIDL/html.idl
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/WebIDL/html.idl
rename to contrib/network/netsurf/netsurf/javascript/WebIDL/html.idl
diff --git a/programs/network/netsurf/netsurf/javascript/content.c b/contrib/network/netsurf/netsurf/javascript/content.c
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/content.c
rename to contrib/network/netsurf/netsurf/javascript/content.c
diff --git a/programs/network/netsurf/netsurf/javascript/content.h b/contrib/network/netsurf/netsurf/javascript/content.h
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/content.h
rename to contrib/network/netsurf/netsurf/javascript/content.h
diff --git a/programs/network/netsurf/netsurf/javascript/js.h b/contrib/network/netsurf/netsurf/javascript/js.h
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/js.h
rename to contrib/network/netsurf/netsurf/javascript/js.h
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi.c b/contrib/network/netsurf/netsurf/javascript/jsapi.c
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi.c
rename to contrib/network/netsurf/netsurf/javascript/jsapi.c
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi.h b/contrib/network/netsurf/netsurf/javascript/jsapi.h
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi.h
rename to contrib/network/netsurf/netsurf/javascript/jsapi.h
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/comment.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/comment.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/comment.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/comment.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/console.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/console.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/console.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/console.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/dom.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/dom.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/dom.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/dom.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/event.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/event.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/event.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/event.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/htmlcollection.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/htmlcollection.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/htmlcollection.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/htmlcollection.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/htmldocument.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/htmldocument.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/htmldocument.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/htmldocument.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/htmlelement.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/htmlelement.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/htmlelement.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/htmlelement.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/location.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/location.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/location.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/location.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/navigator.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/navigator.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/navigator.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/navigator.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/node.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/node.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/node.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/node.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/nodelist.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/nodelist.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/nodelist.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/nodelist.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/text.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/text.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/text.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/text.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/jsapi/window.bnd b/contrib/network/netsurf/netsurf/javascript/jsapi/window.bnd
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/jsapi/window.bnd
rename to contrib/network/netsurf/netsurf/javascript/jsapi/window.bnd
diff --git a/programs/network/netsurf/netsurf/javascript/make.js b/contrib/network/netsurf/netsurf/javascript/make.js
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/make.js
rename to contrib/network/netsurf/netsurf/javascript/make.js
diff --git a/programs/network/netsurf/netsurf/javascript/none.c b/contrib/network/netsurf/netsurf/javascript/none.c
similarity index 100%
rename from programs/network/netsurf/netsurf/javascript/none.c
rename to contrib/network/netsurf/netsurf/javascript/none.c
diff --git a/programs/network/netsurf/netsurf/objs/about.o b/contrib/network/netsurf/netsurf/objs/about.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/about.o
rename to contrib/network/netsurf/netsurf/objs/about.o
diff --git a/programs/network/netsurf/netsurf/objs/base64.o b/contrib/network/netsurf/netsurf/objs/base64.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/base64.o
rename to contrib/network/netsurf/netsurf/objs/base64.o
diff --git a/programs/network/netsurf/netsurf/objs/bitmap.o b/contrib/network/netsurf/netsurf/objs/bitmap.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/bitmap.o
rename to contrib/network/netsurf/netsurf/objs/bitmap.o
diff --git a/programs/network/netsurf/netsurf/objs/bitmap_fbtk.o b/contrib/network/netsurf/netsurf/objs/bitmap_fbtk.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/bitmap_fbtk.o
rename to contrib/network/netsurf/netsurf/objs/bitmap_fbtk.o
diff --git a/programs/network/netsurf/netsurf/objs/bmp.o b/contrib/network/netsurf/netsurf/objs/bmp.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/bmp.o
rename to contrib/network/netsurf/netsurf/objs/bmp.o
diff --git a/programs/network/netsurf/netsurf/objs/box.o b/contrib/network/netsurf/netsurf/objs/box.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/box.o
rename to contrib/network/netsurf/netsurf/objs/box.o
diff --git a/programs/network/netsurf/netsurf/objs/box_construct.o b/contrib/network/netsurf/netsurf/objs/box_construct.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/box_construct.o
rename to contrib/network/netsurf/netsurf/objs/box_construct.o
diff --git a/programs/network/netsurf/netsurf/objs/box_normalise.o b/contrib/network/netsurf/netsurf/objs/box_normalise.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/box_normalise.o
rename to contrib/network/netsurf/netsurf/objs/box_normalise.o
diff --git a/programs/network/netsurf/netsurf/objs/browser.o b/contrib/network/netsurf/netsurf/objs/browser.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/browser.o
rename to contrib/network/netsurf/netsurf/objs/browser.o
diff --git a/programs/network/netsurf/netsurf/objs/caret_image.o b/contrib/network/netsurf/netsurf/objs/caret_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/caret_image.o
rename to contrib/network/netsurf/netsurf/objs/caret_image.o
diff --git a/programs/network/netsurf/netsurf/objs/challenge.o b/contrib/network/netsurf/netsurf/objs/challenge.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/challenge.o
rename to contrib/network/netsurf/netsurf/objs/challenge.o
diff --git a/programs/network/netsurf/netsurf/objs/clipboard.o b/contrib/network/netsurf/netsurf/objs/clipboard.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/clipboard.o
rename to contrib/network/netsurf/netsurf/objs/clipboard.o
diff --git a/programs/network/netsurf/netsurf/objs/content-disposition.o b/contrib/network/netsurf/netsurf/objs/content-disposition.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/content-disposition.o
rename to contrib/network/netsurf/netsurf/objs/content-disposition.o
diff --git a/programs/network/netsurf/netsurf/objs/content-type.o b/contrib/network/netsurf/netsurf/objs/content-type.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/content-type.o
rename to contrib/network/netsurf/netsurf/objs/content-type.o
diff --git a/programs/network/netsurf/netsurf/objs/content.o b/contrib/network/netsurf/netsurf/objs/content.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/content.o
rename to contrib/network/netsurf/netsurf/objs/content.o
diff --git a/programs/network/netsurf/netsurf/objs/content_factory.o b/contrib/network/netsurf/netsurf/objs/content_factory.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/content_factory.o
rename to contrib/network/netsurf/netsurf/objs/content_factory.o
diff --git a/programs/network/netsurf/netsurf/objs/cookies.o b/contrib/network/netsurf/netsurf/objs/cookies.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/cookies.o
rename to contrib/network/netsurf/netsurf/objs/cookies.o
diff --git a/programs/network/netsurf/netsurf/objs/corestrings.o b/contrib/network/netsurf/netsurf/objs/corestrings.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/corestrings.o
rename to contrib/network/netsurf/netsurf/objs/corestrings.o
diff --git a/programs/network/netsurf/netsurf/objs/css.o b/contrib/network/netsurf/netsurf/objs/css.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/css.o
rename to contrib/network/netsurf/netsurf/objs/css.o
diff --git a/programs/network/netsurf/netsurf/objs/curl.o b/contrib/network/netsurf/netsurf/objs/curl.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/curl.o
rename to contrib/network/netsurf/netsurf/objs/curl.o
diff --git a/programs/network/netsurf/netsurf/objs/data.o b/contrib/network/netsurf/netsurf/objs/data.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/data.o
rename to contrib/network/netsurf/netsurf/objs/data.o
diff --git a/programs/network/netsurf/netsurf/objs/dirlist.o b/contrib/network/netsurf/netsurf/objs/dirlist.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/dirlist.o
rename to contrib/network/netsurf/netsurf/objs/dirlist.o
diff --git a/programs/network/netsurf/netsurf/objs/divdi3.c b/contrib/network/netsurf/netsurf/objs/divdi3.c
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/divdi3.c
rename to contrib/network/netsurf/netsurf/objs/divdi3.c
diff --git a/programs/network/netsurf/netsurf/objs/divdi3.o b/contrib/network/netsurf/netsurf/objs/divdi3.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/divdi3.o
rename to contrib/network/netsurf/netsurf/objs/divdi3.o
diff --git a/programs/network/netsurf/netsurf/objs/dll.asm b/contrib/network/netsurf/netsurf/objs/dll.asm
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/dll.asm
rename to contrib/network/netsurf/netsurf/objs/dll.asm
diff --git a/programs/network/netsurf/netsurf/objs/dll.o b/contrib/network/netsurf/netsurf/objs/dll.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/dll.o
rename to contrib/network/netsurf/netsurf/objs/dll.o
diff --git a/programs/network/netsurf/netsurf/objs/download.o b/contrib/network/netsurf/netsurf/objs/download.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/download.o
rename to contrib/network/netsurf/netsurf/objs/download.o
diff --git a/programs/network/netsurf/netsurf/objs/dump.o b/contrib/network/netsurf/netsurf/objs/dump.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/dump.o
rename to contrib/network/netsurf/netsurf/objs/dump.o
diff --git a/programs/network/netsurf/netsurf/objs/event.o b/contrib/network/netsurf/netsurf/objs/event.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/event.o
rename to contrib/network/netsurf/netsurf/objs/event.o
diff --git a/programs/network/netsurf/netsurf/objs/fbtk.o b/contrib/network/netsurf/netsurf/objs/fbtk.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/fbtk.o
rename to contrib/network/netsurf/netsurf/objs/fbtk.o
diff --git a/programs/network/netsurf/netsurf/objs/fetch.o b/contrib/network/netsurf/netsurf/objs/fetch.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/fetch.o
rename to contrib/network/netsurf/netsurf/objs/fetch.o
diff --git a/programs/network/netsurf/netsurf/objs/file.o b/contrib/network/netsurf/netsurf/objs/file.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/file.o
rename to contrib/network/netsurf/netsurf/objs/file.o
diff --git a/programs/network/netsurf/netsurf/objs/filename.o b/contrib/network/netsurf/netsurf/objs/filename.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/filename.o
rename to contrib/network/netsurf/netsurf/objs/filename.o
diff --git a/programs/network/netsurf/netsurf/objs/filepath.o b/contrib/network/netsurf/netsurf/objs/filepath.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/filepath.o
rename to contrib/network/netsurf/netsurf/objs/filepath.o
diff --git a/programs/network/netsurf/netsurf/objs/filetype.o b/contrib/network/netsurf/netsurf/objs/filetype.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/filetype.o
rename to contrib/network/netsurf/netsurf/objs/filetype.o
diff --git a/programs/network/netsurf/netsurf/objs/fill.o b/contrib/network/netsurf/netsurf/objs/fill.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/fill.o
rename to contrib/network/netsurf/netsurf/objs/fill.o
diff --git a/programs/network/netsurf/netsurf/objs/findfile.o b/contrib/network/netsurf/netsurf/objs/findfile.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/findfile.o
rename to contrib/network/netsurf/netsurf/objs/findfile.o
diff --git a/programs/network/netsurf/netsurf/objs/font.o b/contrib/network/netsurf/netsurf/objs/font.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/font.o
rename to contrib/network/netsurf/netsurf/objs/font.o
diff --git a/programs/network/netsurf/netsurf/objs/font_freetype.o b/contrib/network/netsurf/netsurf/objs/font_freetype.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/font_freetype.o
rename to contrib/network/netsurf/netsurf/objs/font_freetype.o
diff --git a/programs/network/netsurf/netsurf/objs/font_internal.o b/contrib/network/netsurf/netsurf/objs/font_internal.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/font_internal.o
rename to contrib/network/netsurf/netsurf/objs/font_internal.o
diff --git a/programs/network/netsurf/netsurf/objs/form.o b/contrib/network/netsurf/netsurf/objs/form.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/form.o
rename to contrib/network/netsurf/netsurf/objs/form.o
diff --git a/programs/network/netsurf/netsurf/objs/framebuffer.o b/contrib/network/netsurf/netsurf/objs/framebuffer.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/framebuffer.o
rename to contrib/network/netsurf/netsurf/objs/framebuffer.o
diff --git a/programs/network/netsurf/netsurf/objs/frames.o b/contrib/network/netsurf/netsurf/objs/frames.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/frames.o
rename to contrib/network/netsurf/netsurf/objs/frames.o
diff --git a/programs/network/netsurf/netsurf/objs/generics.o b/contrib/network/netsurf/netsurf/objs/generics.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/generics.o
rename to contrib/network/netsurf/netsurf/objs/generics.o
diff --git a/programs/network/netsurf/netsurf/objs/gif.o b/contrib/network/netsurf/netsurf/objs/gif.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/gif.o
rename to contrib/network/netsurf/netsurf/objs/gif.o
diff --git a/programs/network/netsurf/netsurf/objs/gui.o b/contrib/network/netsurf/netsurf/objs/gui.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/gui.o
rename to contrib/network/netsurf/netsurf/objs/gui.o
diff --git a/programs/network/netsurf/netsurf/objs/hand_image.o b/contrib/network/netsurf/netsurf/objs/hand_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/hand_image.o
rename to contrib/network/netsurf/netsurf/objs/hand_image.o
diff --git a/programs/network/netsurf/netsurf/objs/hashtable.o b/contrib/network/netsurf/netsurf/objs/hashtable.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/hashtable.o
rename to contrib/network/netsurf/netsurf/objs/hashtable.o
diff --git a/programs/network/netsurf/netsurf/objs/history_core.o b/contrib/network/netsurf/netsurf/objs/history_core.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/history_core.o
rename to contrib/network/netsurf/netsurf/objs/history_core.o
diff --git a/programs/network/netsurf/netsurf/objs/history_global_core.o b/contrib/network/netsurf/netsurf/objs/history_global_core.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/history_global_core.o
rename to contrib/network/netsurf/netsurf/objs/history_global_core.o
diff --git a/programs/network/netsurf/netsurf/objs/history_image.o b/contrib/network/netsurf/netsurf/objs/history_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/history_image.o
rename to contrib/network/netsurf/netsurf/objs/history_image.o
diff --git a/programs/network/netsurf/netsurf/objs/history_image_g.o b/contrib/network/netsurf/netsurf/objs/history_image_g.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/history_image_g.o
rename to contrib/network/netsurf/netsurf/objs/history_image_g.o
diff --git a/programs/network/netsurf/netsurf/objs/hlcache.o b/contrib/network/netsurf/netsurf/objs/hlcache.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/hlcache.o
rename to contrib/network/netsurf/netsurf/objs/hlcache.o
diff --git a/programs/network/netsurf/netsurf/objs/hotlist.o b/contrib/network/netsurf/netsurf/objs/hotlist.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/hotlist.o
rename to contrib/network/netsurf/netsurf/objs/hotlist.o
diff --git a/programs/network/netsurf/netsurf/objs/html.o b/contrib/network/netsurf/netsurf/objs/html.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/html.o
rename to contrib/network/netsurf/netsurf/objs/html.o
diff --git a/programs/network/netsurf/netsurf/objs/html_forms.o b/contrib/network/netsurf/netsurf/objs/html_forms.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/html_forms.o
rename to contrib/network/netsurf/netsurf/objs/html_forms.o
diff --git a/programs/network/netsurf/netsurf/objs/html_interaction.o b/contrib/network/netsurf/netsurf/objs/html_interaction.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/html_interaction.o
rename to contrib/network/netsurf/netsurf/objs/html_interaction.o
diff --git a/programs/network/netsurf/netsurf/objs/html_redraw.o b/contrib/network/netsurf/netsurf/objs/html_redraw.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/html_redraw.o
rename to contrib/network/netsurf/netsurf/objs/html_redraw.o
diff --git a/programs/network/netsurf/netsurf/objs/html_script.o b/contrib/network/netsurf/netsurf/objs/html_script.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/html_script.o
rename to contrib/network/netsurf/netsurf/objs/html_script.o
diff --git a/programs/network/netsurf/netsurf/objs/ico.o b/contrib/network/netsurf/netsurf/objs/ico.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/ico.o
rename to contrib/network/netsurf/netsurf/objs/ico.o
diff --git a/programs/network/netsurf/netsurf/objs/image.o b/contrib/network/netsurf/netsurf/objs/image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/image.o
rename to contrib/network/netsurf/netsurf/objs/image.o
diff --git a/programs/network/netsurf/netsurf/objs/image_cache.o b/contrib/network/netsurf/netsurf/objs/image_cache.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/image_cache.o
rename to contrib/network/netsurf/netsurf/objs/image_cache.o
diff --git a/programs/network/netsurf/netsurf/objs/imagemap.o b/contrib/network/netsurf/netsurf/objs/imagemap.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/imagemap.o
rename to contrib/network/netsurf/netsurf/objs/imagemap.o
diff --git a/programs/network/netsurf/netsurf/objs/internal.o b/contrib/network/netsurf/netsurf/objs/internal.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/internal.o
rename to contrib/network/netsurf/netsurf/objs/internal.o
diff --git a/programs/network/netsurf/netsurf/objs/jpeg.o b/contrib/network/netsurf/netsurf/objs/jpeg.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/jpeg.o
rename to contrib/network/netsurf/netsurf/objs/jpeg.o
diff --git a/programs/network/netsurf/netsurf/objs/knockout.o b/contrib/network/netsurf/netsurf/objs/knockout.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/knockout.o
rename to contrib/network/netsurf/netsurf/objs/knockout.o
diff --git a/programs/network/netsurf/netsurf/objs/layout.o b/contrib/network/netsurf/netsurf/objs/layout.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/layout.o
rename to contrib/network/netsurf/netsurf/objs/layout.o
diff --git a/programs/network/netsurf/netsurf/objs/left_arrow.o b/contrib/network/netsurf/netsurf/objs/left_arrow.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/left_arrow.o
rename to contrib/network/netsurf/netsurf/objs/left_arrow.o
diff --git a/programs/network/netsurf/netsurf/objs/left_arrow_g.o b/contrib/network/netsurf/netsurf/objs/left_arrow_g.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/left_arrow_g.o
rename to contrib/network/netsurf/netsurf/objs/left_arrow_g.o
diff --git a/programs/network/netsurf/netsurf/objs/libdom.o b/contrib/network/netsurf/netsurf/objs/libdom.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/libdom.o
rename to contrib/network/netsurf/netsurf/objs/libdom.o
diff --git a/programs/network/netsurf/netsurf/objs/list.o b/contrib/network/netsurf/netsurf/objs/list.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/list.o
rename to contrib/network/netsurf/netsurf/objs/list.o
diff --git a/programs/network/netsurf/netsurf/objs/llcache.o b/contrib/network/netsurf/netsurf/objs/llcache.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/llcache.o
rename to contrib/network/netsurf/netsurf/objs/llcache.o
diff --git a/programs/network/netsurf/netsurf/objs/locale.o b/contrib/network/netsurf/netsurf/objs/locale.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/locale.o
rename to contrib/network/netsurf/netsurf/objs/locale.o
diff --git a/programs/network/netsurf/netsurf/objs/localhistory.o b/contrib/network/netsurf/netsurf/objs/localhistory.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/localhistory.o
rename to contrib/network/netsurf/netsurf/objs/localhistory.o
diff --git a/programs/network/netsurf/netsurf/objs/log.o b/contrib/network/netsurf/netsurf/objs/log.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/log.o
rename to contrib/network/netsurf/netsurf/objs/log.o
diff --git a/programs/network/netsurf/netsurf/objs/login.o b/contrib/network/netsurf/netsurf/objs/login.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/login.o
rename to contrib/network/netsurf/netsurf/objs/login.o
diff --git a/programs/network/netsurf/netsurf/objs/longlong.h b/contrib/network/netsurf/netsurf/objs/longlong.h
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/longlong.h
rename to contrib/network/netsurf/netsurf/objs/longlong.h
diff --git a/programs/network/netsurf/netsurf/objs/make.all b/contrib/network/netsurf/netsurf/objs/make.all
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/make.all
rename to contrib/network/netsurf/netsurf/objs/make.all
diff --git a/programs/network/netsurf/netsurf/objs/menu_image.o b/contrib/network/netsurf/netsurf/objs/menu_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/menu_image.o
rename to contrib/network/netsurf/netsurf/objs/menu_image.o
diff --git a/programs/network/netsurf/netsurf/objs/messages.o b/contrib/network/netsurf/netsurf/objs/messages.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/messages.o
rename to contrib/network/netsurf/netsurf/objs/messages.o
diff --git a/programs/network/netsurf/netsurf/objs/mimesniff.o b/contrib/network/netsurf/netsurf/objs/mimesniff.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/mimesniff.o
rename to contrib/network/netsurf/netsurf/objs/mimesniff.o
diff --git a/programs/network/netsurf/netsurf/objs/misc.o b/contrib/network/netsurf/netsurf/objs/misc.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/misc.o
rename to contrib/network/netsurf/netsurf/objs/misc.o
diff --git a/programs/network/netsurf/netsurf/objs/mouse.o b/contrib/network/netsurf/netsurf/objs/mouse.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/mouse.o
rename to contrib/network/netsurf/netsurf/objs/mouse.o
diff --git a/programs/network/netsurf/netsurf/objs/move_image.o b/contrib/network/netsurf/netsurf/objs/move_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/move_image.o
rename to contrib/network/netsurf/netsurf/objs/move_image.o
diff --git a/programs/network/netsurf/netsurf/objs/netsurf.o b/contrib/network/netsurf/netsurf/objs/netsurf.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/netsurf.o
rename to contrib/network/netsurf/netsurf/objs/netsurf.o
diff --git a/programs/network/netsurf/netsurf/objs/none.o b/contrib/network/netsurf/netsurf/objs/none.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/none.o
rename to contrib/network/netsurf/netsurf/objs/none.o
diff --git a/programs/network/netsurf/netsurf/objs/nsfont_bold.o b/contrib/network/netsurf/netsurf/objs/nsfont_bold.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/nsfont_bold.o
rename to contrib/network/netsurf/netsurf/objs/nsfont_bold.o
diff --git a/programs/network/netsurf/netsurf/objs/nsfont_italic.o b/contrib/network/netsurf/netsurf/objs/nsfont_italic.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/nsfont_italic.o
rename to contrib/network/netsurf/netsurf/objs/nsfont_italic.o
diff --git a/programs/network/netsurf/netsurf/objs/nsfont_italic_bold.o b/contrib/network/netsurf/netsurf/objs/nsfont_italic_bold.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/nsfont_italic_bold.o
rename to contrib/network/netsurf/netsurf/objs/nsfont_italic_bold.o
diff --git a/programs/network/netsurf/netsurf/objs/nsfont_regular.o b/contrib/network/netsurf/netsurf/objs/nsfont_regular.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/nsfont_regular.o
rename to contrib/network/netsurf/netsurf/objs/nsfont_regular.o
diff --git a/programs/network/netsurf/netsurf/objs/nsurl.o b/contrib/network/netsurf/netsurf/objs/nsurl.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/nsurl.o
rename to contrib/network/netsurf/netsurf/objs/nsurl.o
diff --git a/programs/network/netsurf/netsurf/objs/options.o b/contrib/network/netsurf/netsurf/objs/options.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/options.o
rename to contrib/network/netsurf/netsurf/objs/options.o
diff --git a/programs/network/netsurf/netsurf/objs/osk.o b/contrib/network/netsurf/netsurf/objs/osk.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/osk.o
rename to contrib/network/netsurf/netsurf/objs/osk.o
diff --git a/programs/network/netsurf/netsurf/objs/osk_image.o b/contrib/network/netsurf/netsurf/objs/osk_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/osk_image.o
rename to contrib/network/netsurf/netsurf/objs/osk_image.o
diff --git a/programs/network/netsurf/netsurf/objs/parameter.o b/contrib/network/netsurf/netsurf/objs/parameter.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/parameter.o
rename to contrib/network/netsurf/netsurf/objs/parameter.o
diff --git a/programs/network/netsurf/netsurf/objs/plot_style.o b/contrib/network/netsurf/netsurf/objs/plot_style.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/plot_style.o
rename to contrib/network/netsurf/netsurf/objs/plot_style.o
diff --git a/programs/network/netsurf/netsurf/objs/png.o b/contrib/network/netsurf/netsurf/objs/png.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/png.o
rename to contrib/network/netsurf/netsurf/objs/png.o
diff --git a/programs/network/netsurf/netsurf/objs/pointer_image.o b/contrib/network/netsurf/netsurf/objs/pointer_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/pointer_image.o
rename to contrib/network/netsurf/netsurf/objs/pointer_image.o
diff --git a/programs/network/netsurf/netsurf/objs/primitives.o b/contrib/network/netsurf/netsurf/objs/primitives.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/primitives.o
rename to contrib/network/netsurf/netsurf/objs/primitives.o
diff --git a/programs/network/netsurf/netsurf/objs/print.o b/contrib/network/netsurf/netsurf/objs/print.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/print.o
rename to contrib/network/netsurf/netsurf/objs/print.o
diff --git a/programs/network/netsurf/netsurf/objs/progress_image.o b/contrib/network/netsurf/netsurf/objs/progress_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/progress_image.o
rename to contrib/network/netsurf/netsurf/objs/progress_image.o
diff --git a/programs/network/netsurf/netsurf/objs/reload.o b/contrib/network/netsurf/netsurf/objs/reload.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/reload.o
rename to contrib/network/netsurf/netsurf/objs/reload.o
diff --git a/programs/network/netsurf/netsurf/objs/reload_g.o b/contrib/network/netsurf/netsurf/objs/reload_g.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/reload_g.o
rename to contrib/network/netsurf/netsurf/objs/reload_g.o
diff --git a/programs/network/netsurf/netsurf/objs/resource.o b/contrib/network/netsurf/netsurf/objs/resource.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/resource.o
rename to contrib/network/netsurf/netsurf/objs/resource.o
diff --git a/programs/network/netsurf/netsurf/objs/right_arrow.o b/contrib/network/netsurf/netsurf/objs/right_arrow.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/right_arrow.o
rename to contrib/network/netsurf/netsurf/objs/right_arrow.o
diff --git a/programs/network/netsurf/netsurf/objs/right_arrow_g.o b/contrib/network/netsurf/netsurf/objs/right_arrow_g.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/right_arrow_g.o
rename to contrib/network/netsurf/netsurf/objs/right_arrow_g.o
diff --git a/programs/network/netsurf/netsurf/objs/save_complete.o b/contrib/network/netsurf/netsurf/objs/save_complete.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/save_complete.o
rename to contrib/network/netsurf/netsurf/objs/save_complete.o
diff --git a/programs/network/netsurf/netsurf/objs/save_text.o b/contrib/network/netsurf/netsurf/objs/save_text.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/save_text.o
rename to contrib/network/netsurf/netsurf/objs/save_text.o
diff --git a/programs/network/netsurf/netsurf/objs/schedule.o b/contrib/network/netsurf/netsurf/objs/schedule.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/schedule.o
rename to contrib/network/netsurf/netsurf/objs/schedule.o
diff --git a/programs/network/netsurf/netsurf/objs/scroll.o b/contrib/network/netsurf/netsurf/objs/scroll.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/scroll.o
rename to contrib/network/netsurf/netsurf/objs/scroll.o
diff --git a/programs/network/netsurf/netsurf/objs/scrollbar.o b/contrib/network/netsurf/netsurf/objs/scrollbar.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/scrollbar.o
rename to contrib/network/netsurf/netsurf/objs/scrollbar.o
diff --git a/programs/network/netsurf/netsurf/objs/scrolld.o b/contrib/network/netsurf/netsurf/objs/scrolld.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/scrolld.o
rename to contrib/network/netsurf/netsurf/objs/scrolld.o
diff --git a/programs/network/netsurf/netsurf/objs/scrolll.o b/contrib/network/netsurf/netsurf/objs/scrolll.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/scrolll.o
rename to contrib/network/netsurf/netsurf/objs/scrolll.o
diff --git a/programs/network/netsurf/netsurf/objs/scrollr.o b/contrib/network/netsurf/netsurf/objs/scrollr.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/scrollr.o
rename to contrib/network/netsurf/netsurf/objs/scrollr.o
diff --git a/programs/network/netsurf/netsurf/objs/scrollu.o b/contrib/network/netsurf/netsurf/objs/scrollu.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/scrollu.o
rename to contrib/network/netsurf/netsurf/objs/scrollu.o
diff --git a/programs/network/netsurf/netsurf/objs/search.o b/contrib/network/netsurf/netsurf/objs/search.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/search.o
rename to contrib/network/netsurf/netsurf/objs/search.o
diff --git a/programs/network/netsurf/netsurf/objs/search_ren.o b/contrib/network/netsurf/netsurf/objs/search_ren.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/search_ren.o
rename to contrib/network/netsurf/netsurf/objs/search_ren.o
diff --git a/programs/network/netsurf/netsurf/objs/searchweb.o b/contrib/network/netsurf/netsurf/objs/searchweb.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/searchweb.o
rename to contrib/network/netsurf/netsurf/objs/searchweb.o
diff --git a/programs/network/netsurf/netsurf/objs/select.o b/contrib/network/netsurf/netsurf/objs/select.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/select.o
rename to contrib/network/netsurf/netsurf/objs/select.o
diff --git a/programs/network/netsurf/netsurf/objs/selection.o b/contrib/network/netsurf/netsurf/objs/selection.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/selection.o
rename to contrib/network/netsurf/netsurf/objs/selection.o
diff --git a/programs/network/netsurf/netsurf/objs/snprintf.c b/contrib/network/netsurf/netsurf/objs/snprintf.c
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/snprintf.c
rename to contrib/network/netsurf/netsurf/objs/snprintf.c
diff --git a/programs/network/netsurf/netsurf/objs/snprintf.h b/contrib/network/netsurf/netsurf/objs/snprintf.h
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/snprintf.h
rename to contrib/network/netsurf/netsurf/objs/snprintf.h
diff --git a/programs/network/netsurf/netsurf/objs/snprintf.o b/contrib/network/netsurf/netsurf/objs/snprintf.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/snprintf.o
rename to contrib/network/netsurf/netsurf/objs/snprintf.o
diff --git a/programs/network/netsurf/netsurf/objs/src b/contrib/network/netsurf/netsurf/objs/src
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/src
rename to contrib/network/netsurf/netsurf/objs/src
diff --git a/programs/network/netsurf/netsurf/objs/sslcert.o b/contrib/network/netsurf/netsurf/objs/sslcert.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/sslcert.o
rename to contrib/network/netsurf/netsurf/objs/sslcert.o
diff --git a/programs/network/netsurf/netsurf/objs/stop_image.o b/contrib/network/netsurf/netsurf/objs/stop_image.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/stop_image.o
rename to contrib/network/netsurf/netsurf/objs/stop_image.o
diff --git a/programs/network/netsurf/netsurf/objs/stop_image_g.o b/contrib/network/netsurf/netsurf/objs/stop_image_g.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/stop_image_g.o
rename to contrib/network/netsurf/netsurf/objs/stop_image_g.o
diff --git a/programs/network/netsurf/netsurf/objs/stubs.c b/contrib/network/netsurf/netsurf/objs/stubs.c
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/stubs.c
rename to contrib/network/netsurf/netsurf/objs/stubs.c
diff --git a/programs/network/netsurf/netsurf/objs/stubs.o b/contrib/network/netsurf/netsurf/objs/stubs.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/stubs.o
rename to contrib/network/netsurf/netsurf/objs/stubs.o
diff --git a/programs/network/netsurf/netsurf/objs/system_colour.o b/contrib/network/netsurf/netsurf/objs/system_colour.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/system_colour.o
rename to contrib/network/netsurf/netsurf/objs/system_colour.o
diff --git a/programs/network/netsurf/netsurf/objs/table.o b/contrib/network/netsurf/netsurf/objs/table.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/table.o
rename to contrib/network/netsurf/netsurf/objs/table.o
diff --git a/programs/network/netsurf/netsurf/objs/talloc.o b/contrib/network/netsurf/netsurf/objs/talloc.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/talloc.o
rename to contrib/network/netsurf/netsurf/objs/talloc.o
diff --git a/programs/network/netsurf/netsurf/objs/text.o b/contrib/network/netsurf/netsurf/objs/text.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/text.o
rename to contrib/network/netsurf/netsurf/objs/text.o
diff --git a/programs/network/netsurf/netsurf/objs/textarea.o b/contrib/network/netsurf/netsurf/objs/textarea.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/textarea.o
rename to contrib/network/netsurf/netsurf/objs/textarea.o
diff --git a/programs/network/netsurf/netsurf/objs/textinput.o b/contrib/network/netsurf/netsurf/objs/textinput.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/textinput.o
rename to contrib/network/netsurf/netsurf/objs/textinput.o
diff --git a/programs/network/netsurf/netsurf/objs/textinput_r.o b/contrib/network/netsurf/netsurf/objs/textinput_r.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/textinput_r.o
rename to contrib/network/netsurf/netsurf/objs/textinput_r.o
diff --git a/programs/network/netsurf/netsurf/objs/textplain.o b/contrib/network/netsurf/netsurf/objs/textplain.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/textplain.o
rename to contrib/network/netsurf/netsurf/objs/textplain.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber0.o b/contrib/network/netsurf/netsurf/objs/throbber0.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber0.o
rename to contrib/network/netsurf/netsurf/objs/throbber0.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber1.o b/contrib/network/netsurf/netsurf/objs/throbber1.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber1.o
rename to contrib/network/netsurf/netsurf/objs/throbber1.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber2.o b/contrib/network/netsurf/netsurf/objs/throbber2.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber2.o
rename to contrib/network/netsurf/netsurf/objs/throbber2.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber3.o b/contrib/network/netsurf/netsurf/objs/throbber3.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber3.o
rename to contrib/network/netsurf/netsurf/objs/throbber3.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber4.o b/contrib/network/netsurf/netsurf/objs/throbber4.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber4.o
rename to contrib/network/netsurf/netsurf/objs/throbber4.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber5.o b/contrib/network/netsurf/netsurf/objs/throbber5.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber5.o
rename to contrib/network/netsurf/netsurf/objs/throbber5.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber6.o b/contrib/network/netsurf/netsurf/objs/throbber6.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber6.o
rename to contrib/network/netsurf/netsurf/objs/throbber6.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber7.o b/contrib/network/netsurf/netsurf/objs/throbber7.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber7.o
rename to contrib/network/netsurf/netsurf/objs/throbber7.o
diff --git a/programs/network/netsurf/netsurf/objs/throbber8.o b/contrib/network/netsurf/netsurf/objs/throbber8.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/throbber8.o
rename to contrib/network/netsurf/netsurf/objs/throbber8.o
diff --git a/programs/network/netsurf/netsurf/objs/thumb_ddesk.o b/contrib/network/netsurf/netsurf/objs/thumb_ddesk.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/thumb_ddesk.o
rename to contrib/network/netsurf/netsurf/objs/thumb_ddesk.o
diff --git a/programs/network/netsurf/netsurf/objs/thumbnail.o b/contrib/network/netsurf/netsurf/objs/thumbnail.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/thumbnail.o
rename to contrib/network/netsurf/netsurf/objs/thumbnail.o
diff --git a/programs/network/netsurf/netsurf/objs/tree.o b/contrib/network/netsurf/netsurf/objs/tree.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/tree.o
rename to contrib/network/netsurf/netsurf/objs/tree.o
diff --git a/programs/network/netsurf/netsurf/objs/tree_ddesk.o b/contrib/network/netsurf/netsurf/objs/tree_ddesk.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/tree_ddesk.o
rename to contrib/network/netsurf/netsurf/objs/tree_ddesk.o
diff --git a/programs/network/netsurf/netsurf/objs/tree_url_node.o b/contrib/network/netsurf/netsurf/objs/tree_url_node.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/tree_url_node.o
rename to contrib/network/netsurf/netsurf/objs/tree_url_node.o
diff --git a/programs/network/netsurf/netsurf/objs/url.o b/contrib/network/netsurf/netsurf/objs/url.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/url.o
rename to contrib/network/netsurf/netsurf/objs/url.o
diff --git a/programs/network/netsurf/netsurf/objs/urldb.o b/contrib/network/netsurf/netsurf/objs/urldb.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/urldb.o
rename to contrib/network/netsurf/netsurf/objs/urldb.o
diff --git a/programs/network/netsurf/netsurf/objs/user.o b/contrib/network/netsurf/netsurf/objs/user.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/user.o
rename to contrib/network/netsurf/netsurf/objs/user.o
diff --git a/programs/network/netsurf/netsurf/objs/useragent.o b/contrib/network/netsurf/netsurf/objs/useragent.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/useragent.o
rename to contrib/network/netsurf/netsurf/objs/useragent.o
diff --git a/programs/network/netsurf/netsurf/objs/utf8.o b/contrib/network/netsurf/netsurf/objs/utf8.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/utf8.o
rename to contrib/network/netsurf/netsurf/objs/utf8.o
diff --git a/programs/network/netsurf/netsurf/objs/utils.o b/contrib/network/netsurf/netsurf/objs/utils.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/utils.o
rename to contrib/network/netsurf/netsurf/objs/utils.o
diff --git a/programs/network/netsurf/netsurf/objs/utils_utils.o b/contrib/network/netsurf/netsurf/objs/utils_utils.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/utils_utils.o
rename to contrib/network/netsurf/netsurf/objs/utils_utils.o
diff --git a/programs/network/netsurf/netsurf/objs/version.o b/contrib/network/netsurf/netsurf/objs/version.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/version.o
rename to contrib/network/netsurf/netsurf/objs/version.o
diff --git a/programs/network/netsurf/netsurf/objs/window.o b/contrib/network/netsurf/netsurf/objs/window.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/window.o
rename to contrib/network/netsurf/netsurf/objs/window.o
diff --git a/programs/network/netsurf/netsurf/objs/www-authenticate.o b/contrib/network/netsurf/netsurf/objs/www-authenticate.o
similarity index 100%
rename from programs/network/netsurf/netsurf/objs/www-authenticate.o
rename to contrib/network/netsurf/netsurf/objs/www-authenticate.o
diff --git a/programs/network/netsurf/netsurf/render/box.c b/contrib/network/netsurf/netsurf/render/box.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/box.c
rename to contrib/network/netsurf/netsurf/render/box.c
diff --git a/programs/network/netsurf/netsurf/render/box.h b/contrib/network/netsurf/netsurf/render/box.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/box.h
rename to contrib/network/netsurf/netsurf/render/box.h
diff --git a/programs/network/netsurf/netsurf/render/box_construct.c b/contrib/network/netsurf/netsurf/render/box_construct.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/box_construct.c
rename to contrib/network/netsurf/netsurf/render/box_construct.c
diff --git a/programs/network/netsurf/netsurf/render/box_normalise.c b/contrib/network/netsurf/netsurf/render/box_normalise.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/box_normalise.c
rename to contrib/network/netsurf/netsurf/render/box_normalise.c
diff --git a/programs/network/netsurf/netsurf/render/font.c b/contrib/network/netsurf/netsurf/render/font.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/font.c
rename to contrib/network/netsurf/netsurf/render/font.c
diff --git a/programs/network/netsurf/netsurf/render/font.h b/contrib/network/netsurf/netsurf/render/font.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/font.h
rename to contrib/network/netsurf/netsurf/render/font.h
diff --git a/programs/network/netsurf/netsurf/render/form.c b/contrib/network/netsurf/netsurf/render/form.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/form.c
rename to contrib/network/netsurf/netsurf/render/form.c
diff --git a/programs/network/netsurf/netsurf/render/form.h b/contrib/network/netsurf/netsurf/render/form.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/form.h
rename to contrib/network/netsurf/netsurf/render/form.h
diff --git a/programs/network/netsurf/netsurf/render/html.c b/contrib/network/netsurf/netsurf/render/html.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html.c
rename to contrib/network/netsurf/netsurf/render/html.c
diff --git a/programs/network/netsurf/netsurf/render/html.h b/contrib/network/netsurf/netsurf/render/html.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html.h
rename to contrib/network/netsurf/netsurf/render/html.h
diff --git a/programs/network/netsurf/netsurf/render/html_forms.c b/contrib/network/netsurf/netsurf/render/html_forms.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html_forms.c
rename to contrib/network/netsurf/netsurf/render/html_forms.c
diff --git a/programs/network/netsurf/netsurf/render/html_interaction.c b/contrib/network/netsurf/netsurf/render/html_interaction.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html_interaction.c
rename to contrib/network/netsurf/netsurf/render/html_interaction.c
diff --git a/programs/network/netsurf/netsurf/render/html_internal.h b/contrib/network/netsurf/netsurf/render/html_internal.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html_internal.h
rename to contrib/network/netsurf/netsurf/render/html_internal.h
diff --git a/programs/network/netsurf/netsurf/render/html_redraw.c b/contrib/network/netsurf/netsurf/render/html_redraw.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html_redraw.c
rename to contrib/network/netsurf/netsurf/render/html_redraw.c
diff --git a/programs/network/netsurf/netsurf/render/html_script.c b/contrib/network/netsurf/netsurf/render/html_script.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/html_script.c
rename to contrib/network/netsurf/netsurf/render/html_script.c
diff --git a/programs/network/netsurf/netsurf/render/imagemap.c b/contrib/network/netsurf/netsurf/render/imagemap.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/imagemap.c
rename to contrib/network/netsurf/netsurf/render/imagemap.c
diff --git a/programs/network/netsurf/netsurf/render/imagemap.h b/contrib/network/netsurf/netsurf/render/imagemap.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/imagemap.h
rename to contrib/network/netsurf/netsurf/render/imagemap.h
diff --git a/programs/network/netsurf/netsurf/render/layout.c b/contrib/network/netsurf/netsurf/render/layout.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/layout.c
rename to contrib/network/netsurf/netsurf/render/layout.c
diff --git a/programs/network/netsurf/netsurf/render/layout.h b/contrib/network/netsurf/netsurf/render/layout.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/layout.h
rename to contrib/network/netsurf/netsurf/render/layout.h
diff --git a/programs/network/netsurf/netsurf/render/list.c b/contrib/network/netsurf/netsurf/render/list.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/list.c
rename to contrib/network/netsurf/netsurf/render/list.c
diff --git a/programs/network/netsurf/netsurf/render/list.h b/contrib/network/netsurf/netsurf/render/list.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/list.h
rename to contrib/network/netsurf/netsurf/render/list.h
diff --git a/programs/network/netsurf/netsurf/render/make.render b/contrib/network/netsurf/netsurf/render/make.render
similarity index 100%
rename from programs/network/netsurf/netsurf/render/make.render
rename to contrib/network/netsurf/netsurf/render/make.render
diff --git a/programs/network/netsurf/netsurf/render/search.c b/contrib/network/netsurf/netsurf/render/search.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/search.c
rename to contrib/network/netsurf/netsurf/render/search.c
diff --git a/programs/network/netsurf/netsurf/render/search.h b/contrib/network/netsurf/netsurf/render/search.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/search.h
rename to contrib/network/netsurf/netsurf/render/search.h
diff --git a/programs/network/netsurf/netsurf/render/table.c b/contrib/network/netsurf/netsurf/render/table.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/table.c
rename to contrib/network/netsurf/netsurf/render/table.c
diff --git a/programs/network/netsurf/netsurf/render/table.h b/contrib/network/netsurf/netsurf/render/table.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/table.h
rename to contrib/network/netsurf/netsurf/render/table.h
diff --git a/programs/network/netsurf/netsurf/render/textinput.c b/contrib/network/netsurf/netsurf/render/textinput.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/textinput.c
rename to contrib/network/netsurf/netsurf/render/textinput.c
diff --git a/programs/network/netsurf/netsurf/render/textinput.h b/contrib/network/netsurf/netsurf/render/textinput.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/textinput.h
rename to contrib/network/netsurf/netsurf/render/textinput.h
diff --git a/programs/network/netsurf/netsurf/render/textplain.c b/contrib/network/netsurf/netsurf/render/textplain.c
similarity index 100%
rename from programs/network/netsurf/netsurf/render/textplain.c
rename to contrib/network/netsurf/netsurf/render/textplain.c
diff --git a/programs/network/netsurf/netsurf/render/textplain.h b/contrib/network/netsurf/netsurf/render/textplain.h
similarity index 100%
rename from programs/network/netsurf/netsurf/render/textplain.h
rename to contrib/network/netsurf/netsurf/render/textplain.h
diff --git a/programs/network/netsurf/netsurf/resources/FatMessages b/contrib/network/netsurf/netsurf/resources/FatMessages
similarity index 100%
rename from programs/network/netsurf/netsurf/resources/FatMessages
rename to contrib/network/netsurf/netsurf/resources/FatMessages
diff --git a/programs/network/netsurf/netsurf/utils/base64.c b/contrib/network/netsurf/netsurf/utils/base64.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/base64.c
rename to contrib/network/netsurf/netsurf/utils/base64.c
diff --git a/programs/network/netsurf/netsurf/utils/base64.h b/contrib/network/netsurf/netsurf/utils/base64.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/base64.h
rename to contrib/network/netsurf/netsurf/utils/base64.h
diff --git a/programs/network/netsurf/netsurf/utils/config.h b/contrib/network/netsurf/netsurf/utils/config.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/config.h
rename to contrib/network/netsurf/netsurf/utils/config.h
diff --git a/programs/network/netsurf/netsurf/utils/container.c b/contrib/network/netsurf/netsurf/utils/container.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/container.c
rename to contrib/network/netsurf/netsurf/utils/container.c
diff --git a/programs/network/netsurf/netsurf/utils/container.h b/contrib/network/netsurf/netsurf/utils/container.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/container.h
rename to contrib/network/netsurf/netsurf/utils/container.h
diff --git a/programs/network/netsurf/netsurf/utils/corestrings.c b/contrib/network/netsurf/netsurf/utils/corestrings.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/corestrings.c
rename to contrib/network/netsurf/netsurf/utils/corestrings.c
diff --git a/programs/network/netsurf/netsurf/utils/corestrings.h b/contrib/network/netsurf/netsurf/utils/corestrings.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/corestrings.h
rename to contrib/network/netsurf/netsurf/utils/corestrings.h
diff --git a/programs/network/netsurf/netsurf/utils/errors.h b/contrib/network/netsurf/netsurf/utils/errors.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/errors.h
rename to contrib/network/netsurf/netsurf/utils/errors.h
diff --git a/programs/network/netsurf/netsurf/utils/filename.c b/contrib/network/netsurf/netsurf/utils/filename.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/filename.c
rename to contrib/network/netsurf/netsurf/utils/filename.c
diff --git a/programs/network/netsurf/netsurf/utils/filename.h b/contrib/network/netsurf/netsurf/utils/filename.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/filename.h
rename to contrib/network/netsurf/netsurf/utils/filename.h
diff --git a/programs/network/netsurf/netsurf/utils/filepath.c b/contrib/network/netsurf/netsurf/utils/filepath.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/filepath.c
rename to contrib/network/netsurf/netsurf/utils/filepath.c
diff --git a/programs/network/netsurf/netsurf/utils/filepath.h b/contrib/network/netsurf/netsurf/utils/filepath.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/filepath.h
rename to contrib/network/netsurf/netsurf/utils/filepath.h
diff --git a/programs/network/netsurf/netsurf/utils/git-testament.pl b/contrib/network/netsurf/netsurf/utils/git-testament.pl
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/git-testament.pl
rename to contrib/network/netsurf/netsurf/utils/git-testament.pl
diff --git a/programs/network/netsurf/netsurf/utils/hashtable.c b/contrib/network/netsurf/netsurf/utils/hashtable.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/hashtable.c
rename to contrib/network/netsurf/netsurf/utils/hashtable.c
diff --git a/programs/network/netsurf/netsurf/utils/hashtable.h b/contrib/network/netsurf/netsurf/utils/hashtable.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/hashtable.h
rename to contrib/network/netsurf/netsurf/utils/hashtable.h
diff --git a/programs/network/netsurf/netsurf/utils/http.h b/contrib/network/netsurf/netsurf/utils/http.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http.h
rename to contrib/network/netsurf/netsurf/utils/http.h
diff --git a/programs/network/netsurf/netsurf/utils/http/challenge.c b/contrib/network/netsurf/netsurf/utils/http/challenge.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/challenge.c
rename to contrib/network/netsurf/netsurf/utils/http/challenge.c
diff --git a/programs/network/netsurf/netsurf/utils/http/challenge.h b/contrib/network/netsurf/netsurf/utils/http/challenge.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/challenge.h
rename to contrib/network/netsurf/netsurf/utils/http/challenge.h
diff --git a/programs/network/netsurf/netsurf/utils/http/challenge_internal.h b/contrib/network/netsurf/netsurf/utils/http/challenge_internal.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/challenge_internal.h
rename to contrib/network/netsurf/netsurf/utils/http/challenge_internal.h
diff --git a/programs/network/netsurf/netsurf/utils/http/content-disposition.c b/contrib/network/netsurf/netsurf/utils/http/content-disposition.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/content-disposition.c
rename to contrib/network/netsurf/netsurf/utils/http/content-disposition.c
diff --git a/programs/network/netsurf/netsurf/utils/http/content-disposition.h b/contrib/network/netsurf/netsurf/utils/http/content-disposition.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/content-disposition.h
rename to contrib/network/netsurf/netsurf/utils/http/content-disposition.h
diff --git a/programs/network/netsurf/netsurf/utils/http/content-type.c b/contrib/network/netsurf/netsurf/utils/http/content-type.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/content-type.c
rename to contrib/network/netsurf/netsurf/utils/http/content-type.c
diff --git a/programs/network/netsurf/netsurf/utils/http/content-type.h b/contrib/network/netsurf/netsurf/utils/http/content-type.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/content-type.h
rename to contrib/network/netsurf/netsurf/utils/http/content-type.h
diff --git a/programs/network/netsurf/netsurf/utils/http/generics.c b/contrib/network/netsurf/netsurf/utils/http/generics.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/generics.c
rename to contrib/network/netsurf/netsurf/utils/http/generics.c
diff --git a/programs/network/netsurf/netsurf/utils/http/generics.h b/contrib/network/netsurf/netsurf/utils/http/generics.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/generics.h
rename to contrib/network/netsurf/netsurf/utils/http/generics.h
diff --git a/programs/network/netsurf/netsurf/utils/http/make.http b/contrib/network/netsurf/netsurf/utils/http/make.http
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/make.http
rename to contrib/network/netsurf/netsurf/utils/http/make.http
diff --git a/programs/network/netsurf/netsurf/utils/http/parameter.c b/contrib/network/netsurf/netsurf/utils/http/parameter.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/parameter.c
rename to contrib/network/netsurf/netsurf/utils/http/parameter.c
diff --git a/programs/network/netsurf/netsurf/utils/http/parameter.h b/contrib/network/netsurf/netsurf/utils/http/parameter.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/parameter.h
rename to contrib/network/netsurf/netsurf/utils/http/parameter.h
diff --git a/programs/network/netsurf/netsurf/utils/http/parameter_internal.h b/contrib/network/netsurf/netsurf/utils/http/parameter_internal.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/parameter_internal.h
rename to contrib/network/netsurf/netsurf/utils/http/parameter_internal.h
diff --git a/programs/network/netsurf/netsurf/utils/http/primitives.c b/contrib/network/netsurf/netsurf/utils/http/primitives.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/primitives.c
rename to contrib/network/netsurf/netsurf/utils/http/primitives.c
diff --git a/programs/network/netsurf/netsurf/utils/http/primitives.h b/contrib/network/netsurf/netsurf/utils/http/primitives.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/primitives.h
rename to contrib/network/netsurf/netsurf/utils/http/primitives.h
diff --git a/programs/network/netsurf/netsurf/utils/http/www-authenticate.c b/contrib/network/netsurf/netsurf/utils/http/www-authenticate.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/www-authenticate.c
rename to contrib/network/netsurf/netsurf/utils/http/www-authenticate.c
diff --git a/programs/network/netsurf/netsurf/utils/http/www-authenticate.h b/contrib/network/netsurf/netsurf/utils/http/www-authenticate.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/http/www-authenticate.h
rename to contrib/network/netsurf/netsurf/utils/http/www-authenticate.h
diff --git a/programs/network/netsurf/netsurf/utils/libdom.c b/contrib/network/netsurf/netsurf/utils/libdom.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/libdom.c
rename to contrib/network/netsurf/netsurf/utils/libdom.c
diff --git a/programs/network/netsurf/netsurf/utils/libdom.h b/contrib/network/netsurf/netsurf/utils/libdom.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/libdom.h
rename to contrib/network/netsurf/netsurf/utils/libdom.h
diff --git a/programs/network/netsurf/netsurf/utils/locale.c b/contrib/network/netsurf/netsurf/utils/locale.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/locale.c
rename to contrib/network/netsurf/netsurf/utils/locale.c
diff --git a/programs/network/netsurf/netsurf/utils/locale.h b/contrib/network/netsurf/netsurf/utils/locale.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/locale.h
rename to contrib/network/netsurf/netsurf/utils/locale.h
diff --git a/programs/network/netsurf/netsurf/utils/log.c b/contrib/network/netsurf/netsurf/utils/log.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/log.c
rename to contrib/network/netsurf/netsurf/utils/log.c
diff --git a/programs/network/netsurf/netsurf/utils/log.h b/contrib/network/netsurf/netsurf/utils/log.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/log.h
rename to contrib/network/netsurf/netsurf/utils/log.h
diff --git a/programs/network/netsurf/netsurf/utils/make.utils b/contrib/network/netsurf/netsurf/utils/make.utils
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/make.utils
rename to contrib/network/netsurf/netsurf/utils/make.utils
diff --git a/programs/network/netsurf/netsurf/utils/memanalyze.pl b/contrib/network/netsurf/netsurf/utils/memanalyze.pl
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/memanalyze.pl
rename to contrib/network/netsurf/netsurf/utils/memanalyze.pl
diff --git a/programs/network/netsurf/netsurf/utils/memdebug.c b/contrib/network/netsurf/netsurf/utils/memdebug.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/memdebug.c
rename to contrib/network/netsurf/netsurf/utils/memdebug.c
diff --git a/programs/network/netsurf/netsurf/utils/memdebug.h b/contrib/network/netsurf/netsurf/utils/memdebug.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/memdebug.h
rename to contrib/network/netsurf/netsurf/utils/memdebug.h
diff --git a/programs/network/netsurf/netsurf/utils/merge-messages.lua b/contrib/network/netsurf/netsurf/utils/merge-messages.lua
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/merge-messages.lua
rename to contrib/network/netsurf/netsurf/utils/merge-messages.lua
diff --git a/programs/network/netsurf/netsurf/utils/messages.c b/contrib/network/netsurf/netsurf/utils/messages.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/messages.c
rename to contrib/network/netsurf/netsurf/utils/messages.c
diff --git a/programs/network/netsurf/netsurf/utils/messages.h b/contrib/network/netsurf/netsurf/utils/messages.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/messages.h
rename to contrib/network/netsurf/netsurf/utils/messages.h
diff --git a/programs/network/netsurf/netsurf/utils/nsurl.c b/contrib/network/netsurf/netsurf/utils/nsurl.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/nsurl.c
rename to contrib/network/netsurf/netsurf/utils/nsurl.c
diff --git a/programs/network/netsurf/netsurf/utils/nsurl.h b/contrib/network/netsurf/netsurf/utils/nsurl.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/nsurl.h
rename to contrib/network/netsurf/netsurf/utils/nsurl.h
diff --git a/programs/network/netsurf/netsurf/utils/ring.h b/contrib/network/netsurf/netsurf/utils/ring.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/ring.h
rename to contrib/network/netsurf/netsurf/utils/ring.h
diff --git a/programs/network/netsurf/netsurf/utils/schedule.h b/contrib/network/netsurf/netsurf/utils/schedule.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/schedule.h
rename to contrib/network/netsurf/netsurf/utils/schedule.h
diff --git a/programs/network/netsurf/netsurf/utils/split-messages.pl b/contrib/network/netsurf/netsurf/utils/split-messages.pl
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/split-messages.pl
rename to contrib/network/netsurf/netsurf/utils/split-messages.pl
diff --git a/programs/network/netsurf/netsurf/utils/talloc.c b/contrib/network/netsurf/netsurf/utils/talloc.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/talloc.c
rename to contrib/network/netsurf/netsurf/utils/talloc.c
diff --git a/programs/network/netsurf/netsurf/utils/talloc.h b/contrib/network/netsurf/netsurf/utils/talloc.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/talloc.h
rename to contrib/network/netsurf/netsurf/utils/talloc.h
diff --git a/programs/network/netsurf/netsurf/utils/testament.h b/contrib/network/netsurf/netsurf/utils/testament.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/testament.h
rename to contrib/network/netsurf/netsurf/utils/testament.h
diff --git a/programs/network/netsurf/netsurf/utils/types.h b/contrib/network/netsurf/netsurf/utils/types.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/types.h
rename to contrib/network/netsurf/netsurf/utils/types.h
diff --git a/programs/network/netsurf/netsurf/utils/url.c b/contrib/network/netsurf/netsurf/utils/url.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/url.c
rename to contrib/network/netsurf/netsurf/utils/url.c
diff --git a/programs/network/netsurf/netsurf/utils/url.h b/contrib/network/netsurf/netsurf/utils/url.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/url.h
rename to contrib/network/netsurf/netsurf/utils/url.h
diff --git a/programs/network/netsurf/netsurf/utils/useragent.c b/contrib/network/netsurf/netsurf/utils/useragent.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/useragent.c
rename to contrib/network/netsurf/netsurf/utils/useragent.c
diff --git a/programs/network/netsurf/netsurf/utils/useragent.h b/contrib/network/netsurf/netsurf/utils/useragent.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/useragent.h
rename to contrib/network/netsurf/netsurf/utils/useragent.h
diff --git a/programs/network/netsurf/netsurf/utils/utf8.c b/contrib/network/netsurf/netsurf/utils/utf8.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/utf8.c
rename to contrib/network/netsurf/netsurf/utils/utf8.c
diff --git a/programs/network/netsurf/netsurf/utils/utf8.h b/contrib/network/netsurf/netsurf/utils/utf8.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/utf8.h
rename to contrib/network/netsurf/netsurf/utils/utf8.h
diff --git a/programs/network/netsurf/netsurf/utils/utils.c b/contrib/network/netsurf/netsurf/utils/utils.c
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/utils.c
rename to contrib/network/netsurf/netsurf/utils/utils.c
diff --git a/programs/network/netsurf/netsurf/utils/utils.h b/contrib/network/netsurf/netsurf/utils/utils.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/utils.h
rename to contrib/network/netsurf/netsurf/utils/utils.h
diff --git a/programs/network/netsurf/netsurf/utils/utsname.h b/contrib/network/netsurf/netsurf/utils/utsname.h
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/utsname.h
rename to contrib/network/netsurf/netsurf/utils/utsname.h
diff --git a/programs/network/netsurf/netsurf/utils/valgrind.supp b/contrib/network/netsurf/netsurf/utils/valgrind.supp
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/valgrind.supp
rename to contrib/network/netsurf/netsurf/utils/valgrind.supp
diff --git a/programs/network/netsurf/netsurf/utils/warning-blame.sh b/contrib/network/netsurf/netsurf/utils/warning-blame.sh
similarity index 100%
rename from programs/network/netsurf/netsurf/utils/warning-blame.sh
rename to contrib/network/netsurf/netsurf/utils/warning-blame.sh