diff --git a/assdraw/Makefile.am b/contrib/assdraw/Makefile.am
similarity index 100%
rename from assdraw/Makefile.am
rename to contrib/assdraw/Makefile.am
diff --git a/assdraw/assdraw.vcproj b/contrib/assdraw/assdraw.vcproj
similarity index 100%
rename from assdraw/assdraw.vcproj
rename to contrib/assdraw/assdraw.vcproj
diff --git a/assdraw/assdraw_2008.vcproj b/contrib/assdraw/assdraw_2008.vcproj
similarity index 100%
rename from assdraw/assdraw_2008.vcproj
rename to contrib/assdraw/assdraw_2008.vcproj
diff --git a/assdraw/autogen.sh b/contrib/assdraw/autogen.sh
similarity index 100%
rename from assdraw/autogen.sh
rename to contrib/assdraw/autogen.sh
diff --git a/assdraw/configure.in b/contrib/assdraw/configure.in
similarity index 100%
rename from assdraw/configure.in
rename to contrib/assdraw/configure.in
diff --git a/assdraw/libpropgrid/Makefile.am b/contrib/assdraw/libpropgrid/Makefile.am
similarity index 100%
rename from assdraw/libpropgrid/Makefile.am
rename to contrib/assdraw/libpropgrid/Makefile.am
diff --git a/assdraw/libpropgrid/advprops.cpp b/contrib/assdraw/libpropgrid/advprops.cpp
similarity index 100%
rename from assdraw/libpropgrid/advprops.cpp
rename to contrib/assdraw/libpropgrid/advprops.cpp
diff --git a/assdraw/libpropgrid/extras.cpp b/contrib/assdraw/libpropgrid/extras.cpp
similarity index 100%
rename from assdraw/libpropgrid/extras.cpp
rename to contrib/assdraw/libpropgrid/extras.cpp
diff --git a/assdraw/libpropgrid/include/wx/propgrid/Doxyfile b/contrib/assdraw/libpropgrid/include/wx/propgrid/Doxyfile
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/Doxyfile
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/Doxyfile
diff --git a/assdraw/libpropgrid/include/wx/propgrid/advprops.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/advprops.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/advprops.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/advprops.h
diff --git a/assdraw/libpropgrid/include/wx/propgrid/extras.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/extras.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/extras.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/extras.h
diff --git a/assdraw/libpropgrid/include/wx/propgrid/manager.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/manager.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/manager.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/manager.h
diff --git a/assdraw/libpropgrid/include/wx/propgrid/odcombo.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/odcombo.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/odcombo.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/odcombo.h
diff --git a/assdraw/libpropgrid/include/wx/propgrid/pg_dox_mainpage.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/pg_dox_mainpage.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/pg_dox_mainpage.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/pg_dox_mainpage.h
diff --git a/assdraw/libpropgrid/include/wx/propgrid/propdev.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/propdev.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/propdev.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/propdev.h
diff --git a/assdraw/libpropgrid/include/wx/propgrid/propgrid.doxygen b/contrib/assdraw/libpropgrid/include/wx/propgrid/propgrid.doxygen
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/propgrid.doxygen
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/propgrid.doxygen
diff --git a/assdraw/libpropgrid/include/wx/propgrid/propgrid.h b/contrib/assdraw/libpropgrid/include/wx/propgrid/propgrid.h
similarity index 100%
rename from assdraw/libpropgrid/include/wx/propgrid/propgrid.h
rename to contrib/assdraw/libpropgrid/include/wx/propgrid/propgrid.h
diff --git a/assdraw/libpropgrid/manager.cpp b/contrib/assdraw/libpropgrid/manager.cpp
similarity index 100%
rename from assdraw/libpropgrid/manager.cpp
rename to contrib/assdraw/libpropgrid/manager.cpp
diff --git a/assdraw/libpropgrid/odcombo.cpp b/contrib/assdraw/libpropgrid/odcombo.cpp
similarity index 100%
rename from assdraw/libpropgrid/odcombo.cpp
rename to contrib/assdraw/libpropgrid/odcombo.cpp
diff --git a/assdraw/libpropgrid/propgrid.cpp b/contrib/assdraw/libpropgrid/propgrid.cpp
similarity index 100%
rename from assdraw/libpropgrid/propgrid.cpp
rename to contrib/assdraw/libpropgrid/propgrid.cpp
diff --git a/assdraw/libpropgrid/props.cpp b/contrib/assdraw/libpropgrid/props.cpp
similarity index 100%
rename from assdraw/libpropgrid/props.cpp
rename to contrib/assdraw/libpropgrid/props.cpp
diff --git a/assdraw/src/ASSDraw3.dev b/contrib/assdraw/src/ASSDraw3.dev
similarity index 100%
rename from assdraw/src/ASSDraw3.dev
rename to contrib/assdraw/src/ASSDraw3.dev
diff --git a/assdraw/src/ASSDraw3.layout b/contrib/assdraw/src/ASSDraw3.layout
similarity index 100%
rename from assdraw/src/ASSDraw3.layout
rename to contrib/assdraw/src/ASSDraw3.layout
diff --git a/assdraw/src/Makefile.am b/contrib/assdraw/src/Makefile.am
similarity index 100%
rename from assdraw/src/Makefile.am
rename to contrib/assdraw/src/Makefile.am
diff --git a/assdraw/src/Makefile.win b/contrib/assdraw/src/Makefile.win
similarity index 100%
rename from assdraw/src/Makefile.win
rename to contrib/assdraw/src/Makefile.win
diff --git a/assdraw/src/_common.hpp b/contrib/assdraw/src/_common.hpp
similarity index 100%
rename from assdraw/src/_common.hpp
rename to contrib/assdraw/src/_common.hpp
diff --git a/assdraw/src/agg_bcspline.cpp b/contrib/assdraw/src/agg_bcspline.cpp
similarity index 100%
rename from assdraw/src/agg_bcspline.cpp
rename to contrib/assdraw/src/agg_bcspline.cpp
diff --git a/assdraw/src/agg_bcspline.h b/contrib/assdraw/src/agg_bcspline.h
similarity index 100%
rename from assdraw/src/agg_bcspline.h
rename to contrib/assdraw/src/agg_bcspline.h
diff --git a/assdraw/src/agg_conv_bcspline.h b/contrib/assdraw/src/agg_conv_bcspline.h
similarity index 100%
rename from assdraw/src/agg_conv_bcspline.h
rename to contrib/assdraw/src/agg_conv_bcspline.h
diff --git a/assdraw/src/agg_vcgen_bcspline.cpp b/contrib/assdraw/src/agg_vcgen_bcspline.cpp
similarity index 100%
rename from assdraw/src/agg_vcgen_bcspline.cpp
rename to contrib/assdraw/src/agg_vcgen_bcspline.cpp
diff --git a/assdraw/src/agg_vcgen_bcspline.h b/contrib/assdraw/src/agg_vcgen_bcspline.h
similarity index 100%
rename from assdraw/src/agg_vcgen_bcspline.h
rename to contrib/assdraw/src/agg_vcgen_bcspline.h
diff --git a/assdraw/src/agghelper.hpp b/contrib/assdraw/src/agghelper.hpp
similarity index 100%
rename from assdraw/src/agghelper.hpp
rename to contrib/assdraw/src/agghelper.hpp
diff --git a/assdraw/src/assdraw.cpp b/contrib/assdraw/src/assdraw.cpp
similarity index 100%
rename from assdraw/src/assdraw.cpp
rename to contrib/assdraw/src/assdraw.cpp
diff --git a/assdraw/src/assdraw.hpp b/contrib/assdraw/src/assdraw.hpp
similarity index 100%
rename from assdraw/src/assdraw.hpp
rename to contrib/assdraw/src/assdraw.hpp
diff --git a/assdraw/src/assdraw.rc b/contrib/assdraw/src/assdraw.rc
similarity index 100%
rename from assdraw/src/assdraw.rc
rename to contrib/assdraw/src/assdraw.rc
diff --git a/assdraw/src/assdraw_settings.cpp b/contrib/assdraw/src/assdraw_settings.cpp
similarity index 100%
rename from assdraw/src/assdraw_settings.cpp
rename to contrib/assdraw/src/assdraw_settings.cpp
diff --git a/assdraw/src/bitmaps/Copy of assdraw3.bmp b/contrib/assdraw/src/bitmaps/Copy of assdraw3.bmp
similarity index 100%
rename from assdraw/src/bitmaps/Copy of assdraw3.bmp
rename to contrib/assdraw/src/bitmaps/Copy of assdraw3.bmp
diff --git a/assdraw/src/bitmaps/add_.bmp b/contrib/assdraw/src/bitmaps/add_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/add_.bmp
rename to contrib/assdraw/src/bitmaps/add_.bmp
diff --git a/assdraw/src/bitmaps/arr_.bmp b/contrib/assdraw/src/bitmaps/arr_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/arr_.bmp
rename to contrib/assdraw/src/bitmaps/arr_.bmp
diff --git a/assdraw/src/bitmaps/arr_1.bmp b/contrib/assdraw/src/bitmaps/arr_1.bmp
similarity index 100%
rename from assdraw/src/bitmaps/arr_1.bmp
rename to contrib/assdraw/src/bitmaps/arr_1.bmp
diff --git a/assdraw/src/bitmaps/assdraw3.bmp b/contrib/assdraw/src/bitmaps/assdraw3.bmp
similarity index 100%
rename from assdraw/src/bitmaps/assdraw3.bmp
rename to contrib/assdraw/src/bitmaps/assdraw3.bmp
diff --git a/assdraw/src/bitmaps/b_.bmp b/contrib/assdraw/src/bitmaps/b_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/b_.bmp
rename to contrib/assdraw/src/bitmaps/b_.bmp
diff --git a/assdraw/src/bitmaps/b_.cur b/contrib/assdraw/src/bitmaps/b_.cur
similarity index 100%
rename from assdraw/src/bitmaps/b_.cur
rename to contrib/assdraw/src/bitmaps/b_.cur
diff --git a/assdraw/src/bitmaps/c_.bmp b/contrib/assdraw/src/bitmaps/c_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/c_.bmp
rename to contrib/assdraw/src/bitmaps/c_.bmp
diff --git a/assdraw/src/bitmaps/check_.bmp b/contrib/assdraw/src/bitmaps/check_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/check_.bmp
rename to contrib/assdraw/src/bitmaps/check_.bmp
diff --git a/assdraw/src/bitmaps/del_.bmp b/contrib/assdraw/src/bitmaps/del_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/del_.bmp
rename to contrib/assdraw/src/bitmaps/del_.bmp
diff --git a/assdraw/src/bitmaps/del_cross.bmp b/contrib/assdraw/src/bitmaps/del_cross.bmp
similarity index 100%
rename from assdraw/src/bitmaps/del_cross.bmp
rename to contrib/assdraw/src/bitmaps/del_cross.bmp
diff --git a/assdraw/src/bitmaps/help.bmp b/contrib/assdraw/src/bitmaps/help.bmp
similarity index 100%
rename from assdraw/src/bitmaps/help.bmp
rename to contrib/assdraw/src/bitmaps/help.bmp
diff --git a/assdraw/src/bitmaps/help_.bmp b/contrib/assdraw/src/bitmaps/help_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/help_.bmp
rename to contrib/assdraw/src/bitmaps/help_.bmp
diff --git a/assdraw/src/bitmaps/l_.bmp b/contrib/assdraw/src/bitmaps/l_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/l_.bmp
rename to contrib/assdraw/src/bitmaps/l_.bmp
diff --git a/assdraw/src/bitmaps/m_.bmp b/contrib/assdraw/src/bitmaps/m_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/m_.bmp
rename to contrib/assdraw/src/bitmaps/m_.bmp
diff --git a/assdraw/src/bitmaps/n_.bmp b/contrib/assdraw/src/bitmaps/n_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/n_.bmp
rename to contrib/assdraw/src/bitmaps/n_.bmp
diff --git a/assdraw/src/bitmaps/new_.bmp b/contrib/assdraw/src/bitmaps/new_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/new_.bmp
rename to contrib/assdraw/src/bitmaps/new_.bmp
diff --git a/assdraw/src/bitmaps/nut_.bmp b/contrib/assdraw/src/bitmaps/nut_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/nut_.bmp
rename to contrib/assdraw/src/bitmaps/nut_.bmp
diff --git a/assdraw/src/bitmaps/p_.bmp b/contrib/assdraw/src/bitmaps/p_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/p_.bmp
rename to contrib/assdraw/src/bitmaps/p_.bmp
diff --git a/assdraw/src/bitmaps/pan_bg.bmp b/contrib/assdraw/src/bitmaps/pan_bg.bmp
similarity index 100%
rename from assdraw/src/bitmaps/pan_bg.bmp
rename to contrib/assdraw/src/bitmaps/pan_bg.bmp
diff --git a/assdraw/src/bitmaps/pan_both.bmp b/contrib/assdraw/src/bitmaps/pan_both.bmp
similarity index 100%
rename from assdraw/src/bitmaps/pan_both.bmp
rename to contrib/assdraw/src/bitmaps/pan_both.bmp
diff --git a/assdraw/src/bitmaps/pan_shape.bmp b/contrib/assdraw/src/bitmaps/pan_shape.bmp
similarity index 100%
rename from assdraw/src/bitmaps/pan_shape.bmp
rename to contrib/assdraw/src/bitmaps/pan_shape.bmp
diff --git a/assdraw/src/bitmaps/pan_shp.bmp b/contrib/assdraw/src/bitmaps/pan_shp.bmp
similarity index 100%
rename from assdraw/src/bitmaps/pan_shp.bmp
rename to contrib/assdraw/src/bitmaps/pan_shp.bmp
diff --git a/assdraw/src/bitmaps/preview_.bmp b/contrib/assdraw/src/bitmaps/preview_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/preview_.bmp
rename to contrib/assdraw/src/bitmaps/preview_.bmp
diff --git a/assdraw/src/bitmaps/rot_.bmp b/contrib/assdraw/src/bitmaps/rot_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/rot_.bmp
rename to contrib/assdraw/src/bitmaps/rot_.bmp
diff --git a/assdraw/src/bitmaps/s_.bmp b/contrib/assdraw/src/bitmaps/s_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/s_.bmp
rename to contrib/assdraw/src/bitmaps/s_.bmp
diff --git a/assdraw/src/bitmaps/sc_rot_.bmp b/contrib/assdraw/src/bitmaps/sc_rot_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/sc_rot_.bmp
rename to contrib/assdraw/src/bitmaps/sc_rot_.bmp
diff --git a/assdraw/src/bitmaps/src_.bmp b/contrib/assdraw/src/bitmaps/src_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/src_.bmp
rename to contrib/assdraw/src/bitmaps/src_.bmp
diff --git a/assdraw/src/bitmaps/transform.bmp b/contrib/assdraw/src/bitmaps/transform.bmp
similarity index 100%
rename from assdraw/src/bitmaps/transform.bmp
rename to contrib/assdraw/src/bitmaps/transform.bmp
diff --git a/assdraw/src/bitmaps/uncheck_.bmp b/contrib/assdraw/src/bitmaps/uncheck_.bmp
similarity index 100%
rename from assdraw/src/bitmaps/uncheck_.bmp
rename to contrib/assdraw/src/bitmaps/uncheck_.bmp
diff --git a/assdraw/src/canvas.cpp b/contrib/assdraw/src/canvas.cpp
similarity index 100%
rename from assdraw/src/canvas.cpp
rename to contrib/assdraw/src/canvas.cpp
diff --git a/assdraw/src/canvas.hpp b/contrib/assdraw/src/canvas.hpp
similarity index 100%
rename from assdraw/src/canvas.hpp
rename to contrib/assdraw/src/canvas.hpp
diff --git a/assdraw/src/canvas_mouse.cpp b/contrib/assdraw/src/canvas_mouse.cpp
similarity index 100%
rename from assdraw/src/canvas_mouse.cpp
rename to contrib/assdraw/src/canvas_mouse.cpp
diff --git a/assdraw/src/canvas_mouse.hpp b/contrib/assdraw/src/canvas_mouse.hpp
similarity index 100%
rename from assdraw/src/canvas_mouse.hpp
rename to contrib/assdraw/src/canvas_mouse.hpp
diff --git a/assdraw/src/cmd.cpp b/contrib/assdraw/src/cmd.cpp
similarity index 100%
rename from assdraw/src/cmd.cpp
rename to contrib/assdraw/src/cmd.cpp
diff --git a/assdraw/src/cmd.hpp b/contrib/assdraw/src/cmd.hpp
similarity index 100%
rename from assdraw/src/cmd.hpp
rename to contrib/assdraw/src/cmd.hpp
diff --git a/assdraw/src/convert.bat b/contrib/assdraw/src/convert.bat
similarity index 100%
rename from assdraw/src/convert.bat
rename to contrib/assdraw/src/convert.bat
diff --git a/assdraw/src/dlgctrl.cpp b/contrib/assdraw/src/dlgctrl.cpp
similarity index 100%
rename from assdraw/src/dlgctrl.cpp
rename to contrib/assdraw/src/dlgctrl.cpp
diff --git a/assdraw/src/dlgctrl.hpp b/contrib/assdraw/src/dlgctrl.hpp
similarity index 100%
rename from assdraw/src/dlgctrl.hpp
rename to contrib/assdraw/src/dlgctrl.hpp
diff --git a/assdraw/src/engine.cpp b/contrib/assdraw/src/engine.cpp
similarity index 100%
rename from assdraw/src/engine.cpp
rename to contrib/assdraw/src/engine.cpp
diff --git a/assdraw/src/engine.hpp b/contrib/assdraw/src/engine.hpp
similarity index 100%
rename from assdraw/src/engine.hpp
rename to contrib/assdraw/src/engine.hpp
diff --git a/assdraw/src/enums.hpp b/contrib/assdraw/src/enums.hpp
similarity index 100%
rename from assdraw/src/enums.hpp
rename to contrib/assdraw/src/enums.hpp
diff --git a/assdraw/src/include_once.hpp b/contrib/assdraw/src/include_once.hpp
similarity index 100%
rename from assdraw/src/include_once.hpp
rename to contrib/assdraw/src/include_once.hpp
diff --git a/assdraw/src/library.cpp b/contrib/assdraw/src/library.cpp
similarity index 100%
rename from assdraw/src/library.cpp
rename to contrib/assdraw/src/library.cpp
diff --git a/assdraw/src/library.hpp b/contrib/assdraw/src/library.hpp
similarity index 100%
rename from assdraw/src/library.hpp
rename to contrib/assdraw/src/library.hpp
diff --git a/assdraw/src/resource.h b/contrib/assdraw/src/resource.h
similarity index 100%
rename from assdraw/src/resource.h
rename to contrib/assdraw/src/resource.h
diff --git a/assdraw/src/settings.cpp b/contrib/assdraw/src/settings.cpp
similarity index 100%
rename from assdraw/src/settings.cpp
rename to contrib/assdraw/src/settings.cpp
diff --git a/assdraw/src/settings.hpp b/contrib/assdraw/src/settings.hpp
similarity index 100%
rename from assdraw/src/settings.hpp
rename to contrib/assdraw/src/settings.hpp
diff --git a/assdraw/src/t-stringifier.pl b/contrib/assdraw/src/t-stringifier.pl
similarity index 100%
rename from assdraw/src/t-stringifier.pl
rename to contrib/assdraw/src/t-stringifier.pl
diff --git a/assdraw/src/tsukasa.ico b/contrib/assdraw/src/tsukasa.ico
similarity index 100%
rename from assdraw/src/tsukasa.ico
rename to contrib/assdraw/src/tsukasa.ico
diff --git a/assdraw/src/wxAGG/AGGWindow.cpp b/contrib/assdraw/src/wxAGG/AGGWindow.cpp
similarity index 100%
rename from assdraw/src/wxAGG/AGGWindow.cpp
rename to contrib/assdraw/src/wxAGG/AGGWindow.cpp
diff --git a/assdraw/src/wxAGG/AGGWindow.h b/contrib/assdraw/src/wxAGG/AGGWindow.h
similarity index 100%
rename from assdraw/src/wxAGG/AGGWindow.h
rename to contrib/assdraw/src/wxAGG/AGGWindow.h
diff --git a/assdraw/src/wxAGG/Makefile.am b/contrib/assdraw/src/wxAGG/Makefile.am
similarity index 100%
rename from assdraw/src/wxAGG/Makefile.am
rename to contrib/assdraw/src/wxAGG/Makefile.am
diff --git a/assdraw/src/wxAGG/PixelFormatConvertor.h b/contrib/assdraw/src/wxAGG/PixelFormatConvertor.h
similarity index 100%
rename from assdraw/src/wxAGG/PixelFormatConvertor.h
rename to contrib/assdraw/src/wxAGG/PixelFormatConvertor.h
diff --git a/assdraw/src/xpm/Makefile.am b/contrib/assdraw/src/xpm/Makefile.am
similarity index 100%
rename from assdraw/src/xpm/Makefile.am
rename to contrib/assdraw/src/xpm/Makefile.am
diff --git a/assdraw/src/xpm/add__xpm.xpm b/contrib/assdraw/src/xpm/add__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/add__xpm.xpm
rename to contrib/assdraw/src/xpm/add__xpm.xpm
diff --git a/assdraw/src/xpm/appico_xpm.xpm b/contrib/assdraw/src/xpm/appico_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/appico_xpm.xpm
rename to contrib/assdraw/src/xpm/appico_xpm.xpm
diff --git a/assdraw/src/xpm/arr_1_xpm.xpm b/contrib/assdraw/src/xpm/arr_1_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/arr_1_xpm.xpm
rename to contrib/assdraw/src/xpm/arr_1_xpm.xpm
diff --git a/assdraw/src/xpm/arr__xpm.xpm b/contrib/assdraw/src/xpm/arr__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/arr__xpm.xpm
rename to contrib/assdraw/src/xpm/arr__xpm.xpm
diff --git a/assdraw/src/xpm/assdraw3_xpm.xpm b/contrib/assdraw/src/xpm/assdraw3_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/assdraw3_xpm.xpm
rename to contrib/assdraw/src/xpm/assdraw3_xpm.xpm
diff --git a/assdraw/src/xpm/b__xpm.xpm b/contrib/assdraw/src/xpm/b__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/b__xpm.xpm
rename to contrib/assdraw/src/xpm/b__xpm.xpm
diff --git a/assdraw/src/xpm/c__xpm.xpm b/contrib/assdraw/src/xpm/c__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/c__xpm.xpm
rename to contrib/assdraw/src/xpm/c__xpm.xpm
diff --git a/assdraw/src/xpm/check__xpm.xpm b/contrib/assdraw/src/xpm/check__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/check__xpm.xpm
rename to contrib/assdraw/src/xpm/check__xpm.xpm
diff --git a/assdraw/src/xpm/del__xpm.xpm b/contrib/assdraw/src/xpm/del__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/del__xpm.xpm
rename to contrib/assdraw/src/xpm/del__xpm.xpm
diff --git a/assdraw/src/xpm/del_cross_xpm.xpm b/contrib/assdraw/src/xpm/del_cross_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/del_cross_xpm.xpm
rename to contrib/assdraw/src/xpm/del_cross_xpm.xpm
diff --git a/assdraw/src/xpm/help__xpm.xpm b/contrib/assdraw/src/xpm/help__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/help__xpm.xpm
rename to contrib/assdraw/src/xpm/help__xpm.xpm
diff --git a/assdraw/src/xpm/help_xpm.xpm b/contrib/assdraw/src/xpm/help_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/help_xpm.xpm
rename to contrib/assdraw/src/xpm/help_xpm.xpm
diff --git a/assdraw/src/xpm/l__xpm.xpm b/contrib/assdraw/src/xpm/l__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/l__xpm.xpm
rename to contrib/assdraw/src/xpm/l__xpm.xpm
diff --git a/assdraw/src/xpm/m__xpm.xpm b/contrib/assdraw/src/xpm/m__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/m__xpm.xpm
rename to contrib/assdraw/src/xpm/m__xpm.xpm
diff --git a/assdraw/src/xpm/n__xpm.xpm b/contrib/assdraw/src/xpm/n__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/n__xpm.xpm
rename to contrib/assdraw/src/xpm/n__xpm.xpm
diff --git a/assdraw/src/xpm/new__xpm.xpm b/contrib/assdraw/src/xpm/new__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/new__xpm.xpm
rename to contrib/assdraw/src/xpm/new__xpm.xpm
diff --git a/assdraw/src/xpm/nut__xpm.xpm b/contrib/assdraw/src/xpm/nut__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/nut__xpm.xpm
rename to contrib/assdraw/src/xpm/nut__xpm.xpm
diff --git a/assdraw/src/xpm/p__xpm.xpm b/contrib/assdraw/src/xpm/p__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/p__xpm.xpm
rename to contrib/assdraw/src/xpm/p__xpm.xpm
diff --git a/assdraw/src/xpm/pan_bg_xpm.xpm b/contrib/assdraw/src/xpm/pan_bg_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/pan_bg_xpm.xpm
rename to contrib/assdraw/src/xpm/pan_bg_xpm.xpm
diff --git a/assdraw/src/xpm/pan_both_xpm.xpm b/contrib/assdraw/src/xpm/pan_both_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/pan_both_xpm.xpm
rename to contrib/assdraw/src/xpm/pan_both_xpm.xpm
diff --git a/assdraw/src/xpm/pan_shape_xpm.xpm b/contrib/assdraw/src/xpm/pan_shape_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/pan_shape_xpm.xpm
rename to contrib/assdraw/src/xpm/pan_shape_xpm.xpm
diff --git a/assdraw/src/xpm/pan_shp_xpm.xpm b/contrib/assdraw/src/xpm/pan_shp_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/pan_shp_xpm.xpm
rename to contrib/assdraw/src/xpm/pan_shp_xpm.xpm
diff --git a/assdraw/src/xpm/preview__xpm.xpm b/contrib/assdraw/src/xpm/preview__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/preview__xpm.xpm
rename to contrib/assdraw/src/xpm/preview__xpm.xpm
diff --git a/assdraw/src/xpm/res.cpp b/contrib/assdraw/src/xpm/res.cpp
similarity index 100%
rename from assdraw/src/xpm/res.cpp
rename to contrib/assdraw/src/xpm/res.cpp
diff --git a/assdraw/src/xpm/res.h b/contrib/assdraw/src/xpm/res.h
similarity index 100%
rename from assdraw/src/xpm/res.h
rename to contrib/assdraw/src/xpm/res.h
diff --git a/assdraw/src/xpm/rot__xpm.xpm b/contrib/assdraw/src/xpm/rot__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/rot__xpm.xpm
rename to contrib/assdraw/src/xpm/rot__xpm.xpm
diff --git a/assdraw/src/xpm/s__xpm.xpm b/contrib/assdraw/src/xpm/s__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/s__xpm.xpm
rename to contrib/assdraw/src/xpm/s__xpm.xpm
diff --git a/assdraw/src/xpm/sc_rot__xpm.xpm b/contrib/assdraw/src/xpm/sc_rot__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/sc_rot__xpm.xpm
rename to contrib/assdraw/src/xpm/sc_rot__xpm.xpm
diff --git a/assdraw/src/xpm/src__xpm.xpm b/contrib/assdraw/src/xpm/src__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/src__xpm.xpm
rename to contrib/assdraw/src/xpm/src__xpm.xpm
diff --git a/assdraw/src/xpm/transform_xpm.xpm b/contrib/assdraw/src/xpm/transform_xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/transform_xpm.xpm
rename to contrib/assdraw/src/xpm/transform_xpm.xpm
diff --git a/assdraw/src/xpm/uncheck__xpm.xpm b/contrib/assdraw/src/xpm/uncheck__xpm.xpm
similarity index 100%
rename from assdraw/src/xpm/uncheck__xpm.xpm
rename to contrib/assdraw/src/xpm/uncheck__xpm.xpm
diff --git a/csri/Doxyfile b/contrib/csri/Doxyfile
similarity index 100%
rename from csri/Doxyfile
rename to contrib/csri/Doxyfile
diff --git a/csri/LICENSE b/contrib/csri/LICENSE
similarity index 100%
rename from csri/LICENSE
rename to contrib/csri/LICENSE
diff --git a/csri/Makefile.am b/contrib/csri/Makefile.am
similarity index 100%
rename from csri/Makefile.am
rename to contrib/csri/Makefile.am
diff --git a/csri/ac/Makefile.am b/contrib/csri/ac/Makefile.am
similarity index 100%
rename from csri/ac/Makefile.am
rename to contrib/csri/ac/Makefile.am
diff --git a/csri/ac/csri.sln b/contrib/csri/ac/csri.sln
similarity index 100%
rename from csri/ac/csri.sln
rename to contrib/csri/ac/csri.sln
diff --git a/csri/ac/subhelp.vcproj b/contrib/csri/ac/subhelp.vcproj
similarity index 100%
rename from csri/ac/subhelp.vcproj
rename to contrib/csri/ac/subhelp.vcproj
diff --git a/csri/acinclude.m4 b/contrib/csri/acinclude.m4
similarity index 100%
rename from csri/acinclude.m4
rename to contrib/csri/acinclude.m4
diff --git a/csri/backends/Makefile.am b/contrib/csri/backends/Makefile.am
similarity index 100%
rename from csri/backends/Makefile.am
rename to contrib/csri/backends/Makefile.am
diff --git a/csri/backends/libass/Makefile.am b/contrib/csri/backends/libass/Makefile.am
similarity index 100%
rename from csri/backends/libass/Makefile.am
rename to contrib/csri/backends/libass/Makefile.am
diff --git a/csri/backends/libass/libass_csri.c b/contrib/csri/backends/libass/libass_csri.c
similarity index 100%
rename from csri/backends/libass/libass_csri.c
rename to contrib/csri/backends/libass/libass_csri.c
diff --git a/csri/bootstrap b/contrib/csri/bootstrap
similarity index 100%
rename from csri/bootstrap
rename to contrib/csri/bootstrap
diff --git a/csri/configure.ac b/contrib/csri/configure.ac
similarity index 100%
rename from csri/configure.ac
rename to contrib/csri/configure.ac
diff --git a/csri/csri.pc.in b/contrib/csri/csri.pc.in
similarity index 100%
rename from csri/csri.pc.in
rename to contrib/csri/csri.pc.in
diff --git a/csri/csri.vcproj b/contrib/csri/csri.vcproj
similarity index 100%
rename from csri/csri.vcproj
rename to contrib/csri/csri.vcproj
diff --git a/csri/csri_2008.vcproj b/contrib/csri/csri_2008.vcproj
similarity index 100%
rename from csri/csri_2008.vcproj
rename to contrib/csri/csri_2008.vcproj
diff --git a/csri/frontends/Makefile.am b/contrib/csri/frontends/Makefile.am
similarity index 100%
rename from csri/frontends/Makefile.am
rename to contrib/csri/frontends/Makefile.am
diff --git a/csri/frontends/avisynth25/Makefile.am b/contrib/csri/frontends/avisynth25/Makefile.am
similarity index 100%
rename from csri/frontends/avisynth25/Makefile.am
rename to contrib/csri/frontends/avisynth25/Makefile.am
diff --git a/csri/frontends/avisynth25/avisynth.cpp b/contrib/csri/frontends/avisynth25/avisynth.cpp
similarity index 100%
rename from csri/frontends/avisynth25/avisynth.cpp
rename to contrib/csri/frontends/avisynth25/avisynth.cpp
diff --git a/csri/frontends/avisynth25/avisynth.h b/contrib/csri/frontends/avisynth25/avisynth.h
similarity index 100%
rename from csri/frontends/avisynth25/avisynth.h
rename to contrib/csri/frontends/avisynth25/avisynth.h
diff --git a/csri/frontends/cmdline/Makefile.am b/contrib/csri/frontends/cmdline/Makefile.am
similarity index 100%
rename from csri/frontends/cmdline/Makefile.am
rename to contrib/csri/frontends/cmdline/Makefile.am
diff --git a/csri/frontends/cmdline/cmdmain.c b/contrib/csri/frontends/cmdline/cmdmain.c
similarity index 100%
rename from csri/frontends/cmdline/cmdmain.c
rename to contrib/csri/frontends/cmdline/cmdmain.c
diff --git a/csri/frontends/cmdline/render.c b/contrib/csri/frontends/cmdline/render.c
similarity index 100%
rename from csri/frontends/cmdline/render.c
rename to contrib/csri/frontends/cmdline/render.c
diff --git a/csri/frontends/cmdline/render.h b/contrib/csri/frontends/cmdline/render.h
similarity index 100%
rename from csri/frontends/cmdline/render.h
rename to contrib/csri/frontends/cmdline/render.h
diff --git a/csri/include/Makefile.am b/contrib/csri/include/Makefile.am
similarity index 100%
rename from csri/include/Makefile.am
rename to contrib/csri/include/Makefile.am
diff --git a/csri/include/csri/csri.h b/contrib/csri/include/csri/csri.h
similarity index 100%
rename from csri/include/csri/csri.h
rename to contrib/csri/include/csri/csri.h
diff --git a/csri/include/csri/fmtids.h b/contrib/csri/include/csri/fmtids.h
similarity index 100%
rename from csri/include/csri/fmtids.h
rename to contrib/csri/include/csri/fmtids.h
diff --git a/csri/include/csri/logging.h b/contrib/csri/include/csri/logging.h
similarity index 100%
rename from csri/include/csri/logging.h
rename to contrib/csri/include/csri/logging.h
diff --git a/csri/include/csri/openerr.h b/contrib/csri/include/csri/openerr.h
similarity index 100%
rename from csri/include/csri/openerr.h
rename to contrib/csri/include/csri/openerr.h
diff --git a/csri/include/csri/stream.h b/contrib/csri/include/csri/stream.h
similarity index 100%
rename from csri/include/csri/stream.h
rename to contrib/csri/include/csri/stream.h
diff --git a/csri/include/subhelp.h b/contrib/csri/include/subhelp.h
similarity index 100%
rename from csri/include/subhelp.h
rename to contrib/csri/include/subhelp.h
diff --git a/csri/include/visibility.h b/contrib/csri/include/visibility.h
similarity index 100%
rename from csri/include/visibility.h
rename to contrib/csri/include/visibility.h
diff --git a/csri/lib/Makefile.am b/contrib/csri/lib/Makefile.am
similarity index 100%
rename from csri/lib/Makefile.am
rename to contrib/csri/lib/Makefile.am
diff --git a/csri/lib/csrilib.h b/contrib/csri/lib/csrilib.h
similarity index 100%
rename from csri/lib/csrilib.h
rename to contrib/csri/lib/csrilib.h
diff --git a/csri/lib/list.c b/contrib/csri/lib/list.c
similarity index 100%
rename from csri/lib/list.c
rename to contrib/csri/lib/list.c
diff --git a/csri/lib/posix/csrilib_os.h b/contrib/csri/lib/posix/csrilib_os.h
similarity index 100%
rename from csri/lib/posix/csrilib_os.h
rename to contrib/csri/lib/posix/csrilib_os.h
diff --git a/csri/lib/posix/enumerate.c b/contrib/csri/lib/posix/enumerate.c
similarity index 100%
rename from csri/lib/posix/enumerate.c
rename to contrib/csri/lib/posix/enumerate.c
diff --git a/csri/lib/win32/csrilib_os.h b/contrib/csri/lib/win32/csrilib_os.h
similarity index 100%
rename from csri/lib/win32/csrilib_os.h
rename to contrib/csri/lib/win32/csrilib_os.h
diff --git a/csri/lib/win32/enumerate.c b/contrib/csri/lib/win32/enumerate.c
similarity index 100%
rename from csri/lib/win32/enumerate.c
rename to contrib/csri/lib/win32/enumerate.c
diff --git a/csri/lib/wrap.c b/contrib/csri/lib/wrap.c
similarity index 100%
rename from csri/lib/wrap.c
rename to contrib/csri/lib/wrap.c
diff --git a/csri/subhelp/Makefile.am b/contrib/csri/subhelp/Makefile.am
similarity index 100%
rename from csri/subhelp/Makefile.am
rename to contrib/csri/subhelp/Makefile.am
diff --git a/csri/subhelp/logging.c b/contrib/csri/subhelp/logging.c
similarity index 100%
rename from csri/subhelp/logging.c
rename to contrib/csri/subhelp/logging.c
diff --git a/csri/subhelp/posix/openfile.c b/contrib/csri/subhelp/posix/openfile.c
similarity index 100%
rename from csri/subhelp/posix/openfile.c
rename to contrib/csri/subhelp/posix/openfile.c
diff --git a/csri/subhelp/win32/openfile.c b/contrib/csri/subhelp/win32/openfile.c
similarity index 100%
rename from csri/subhelp/win32/openfile.c
rename to contrib/csri/subhelp/win32/openfile.c
diff --git a/hunspell/ABOUT-NLS b/contrib/hunspell/ABOUT-NLS
similarity index 100%
rename from hunspell/ABOUT-NLS
rename to contrib/hunspell/ABOUT-NLS
diff --git a/hunspell/AUTHORS b/contrib/hunspell/AUTHORS
similarity index 100%
rename from hunspell/AUTHORS
rename to contrib/hunspell/AUTHORS
diff --git a/hunspell/AUTHORS.myspell b/contrib/hunspell/AUTHORS.myspell
similarity index 100%
rename from hunspell/AUTHORS.myspell
rename to contrib/hunspell/AUTHORS.myspell
diff --git a/hunspell/BUGS b/contrib/hunspell/BUGS
similarity index 100%
rename from hunspell/BUGS
rename to contrib/hunspell/BUGS
diff --git a/hunspell/COPYING b/contrib/hunspell/COPYING
similarity index 100%
rename from hunspell/COPYING
rename to contrib/hunspell/COPYING
diff --git a/hunspell/COPYING.LGPL b/contrib/hunspell/COPYING.LGPL
similarity index 100%
rename from hunspell/COPYING.LGPL
rename to contrib/hunspell/COPYING.LGPL
diff --git a/hunspell/COPYING.MPL b/contrib/hunspell/COPYING.MPL
similarity index 100%
rename from hunspell/COPYING.MPL
rename to contrib/hunspell/COPYING.MPL
diff --git a/hunspell/ChangeLog b/contrib/hunspell/ChangeLog
similarity index 100%
rename from hunspell/ChangeLog
rename to contrib/hunspell/ChangeLog
diff --git a/hunspell/ChangeLog.O b/contrib/hunspell/ChangeLog.O
similarity index 100%
rename from hunspell/ChangeLog.O
rename to contrib/hunspell/ChangeLog.O
diff --git a/hunspell/INSTALL b/contrib/hunspell/INSTALL
similarity index 100%
rename from hunspell/INSTALL
rename to contrib/hunspell/INSTALL
diff --git a/hunspell/NEWS b/contrib/hunspell/NEWS
similarity index 100%
rename from hunspell/NEWS
rename to contrib/hunspell/NEWS
diff --git a/hunspell/README b/contrib/hunspell/README
similarity index 100%
rename from hunspell/README
rename to contrib/hunspell/README
diff --git a/hunspell/README.myspell b/contrib/hunspell/README.myspell
similarity index 100%
rename from hunspell/README.myspell
rename to contrib/hunspell/README.myspell
diff --git a/hunspell/THANKS b/contrib/hunspell/THANKS
similarity index 100%
rename from hunspell/THANKS
rename to contrib/hunspell/THANKS
diff --git a/hunspell/TODO b/contrib/hunspell/TODO
similarity index 100%
rename from hunspell/TODO
rename to contrib/hunspell/TODO
diff --git a/hunspell/hunspell.pc.in b/contrib/hunspell/hunspell.pc.in
similarity index 100%
rename from hunspell/hunspell.pc.in
rename to contrib/hunspell/hunspell.pc.in
diff --git a/hunspell/license.hunspell b/contrib/hunspell/license.hunspell
similarity index 100%
rename from hunspell/license.hunspell
rename to contrib/hunspell/license.hunspell
diff --git a/hunspell/license.myspell b/contrib/hunspell/license.myspell
similarity index 100%
rename from hunspell/license.myspell
rename to contrib/hunspell/license.myspell
diff --git a/hunspell/missing b/contrib/hunspell/missing
similarity index 100%
rename from hunspell/missing
rename to contrib/hunspell/missing
diff --git a/hunspell/src/Makefile.am b/contrib/hunspell/src/Makefile.am
similarity index 100%
rename from hunspell/src/Makefile.am
rename to contrib/hunspell/src/Makefile.am
diff --git a/hunspell/src/Makefile.in b/contrib/hunspell/src/Makefile.in
similarity index 100%
rename from hunspell/src/Makefile.in
rename to contrib/hunspell/src/Makefile.in
diff --git a/hunspell/src/hunspell/Makefile.am b/contrib/hunspell/src/hunspell/Makefile.am
similarity index 100%
rename from hunspell/src/hunspell/Makefile.am
rename to contrib/hunspell/src/hunspell/Makefile.am
diff --git a/hunspell/src/hunspell/Makefile.in b/contrib/hunspell/src/hunspell/Makefile.in
similarity index 100%
rename from hunspell/src/hunspell/Makefile.in
rename to contrib/hunspell/src/hunspell/Makefile.in
diff --git a/hunspell/src/hunspell/README b/contrib/hunspell/src/hunspell/README
similarity index 100%
rename from hunspell/src/hunspell/README
rename to contrib/hunspell/src/hunspell/README
diff --git a/hunspell/src/hunspell/affentry.cxx b/contrib/hunspell/src/hunspell/affentry.cxx
similarity index 100%
rename from hunspell/src/hunspell/affentry.cxx
rename to contrib/hunspell/src/hunspell/affentry.cxx
diff --git a/hunspell/src/hunspell/affentry.hxx b/contrib/hunspell/src/hunspell/affentry.hxx
similarity index 100%
rename from hunspell/src/hunspell/affentry.hxx
rename to contrib/hunspell/src/hunspell/affentry.hxx
diff --git a/hunspell/src/hunspell/affixmgr.cxx b/contrib/hunspell/src/hunspell/affixmgr.cxx
similarity index 100%
rename from hunspell/src/hunspell/affixmgr.cxx
rename to contrib/hunspell/src/hunspell/affixmgr.cxx
diff --git a/hunspell/src/hunspell/affixmgr.hxx b/contrib/hunspell/src/hunspell/affixmgr.hxx
similarity index 100%
rename from hunspell/src/hunspell/affixmgr.hxx
rename to contrib/hunspell/src/hunspell/affixmgr.hxx
diff --git a/hunspell/src/hunspell/atypes.hxx b/contrib/hunspell/src/hunspell/atypes.hxx
similarity index 100%
rename from hunspell/src/hunspell/atypes.hxx
rename to contrib/hunspell/src/hunspell/atypes.hxx
diff --git a/hunspell/src/hunspell/baseaffix.hxx b/contrib/hunspell/src/hunspell/baseaffix.hxx
similarity index 100%
rename from hunspell/src/hunspell/baseaffix.hxx
rename to contrib/hunspell/src/hunspell/baseaffix.hxx
diff --git a/hunspell/src/hunspell/csutil.cxx b/contrib/hunspell/src/hunspell/csutil.cxx
similarity index 100%
rename from hunspell/src/hunspell/csutil.cxx
rename to contrib/hunspell/src/hunspell/csutil.cxx
diff --git a/hunspell/src/hunspell/csutil.hxx b/contrib/hunspell/src/hunspell/csutil.hxx
similarity index 100%
rename from hunspell/src/hunspell/csutil.hxx
rename to contrib/hunspell/src/hunspell/csutil.hxx
diff --git a/hunspell/src/hunspell/dictmgr.cxx b/contrib/hunspell/src/hunspell/dictmgr.cxx
similarity index 100%
rename from hunspell/src/hunspell/dictmgr.cxx
rename to contrib/hunspell/src/hunspell/dictmgr.cxx
diff --git a/hunspell/src/hunspell/dictmgr.hxx b/contrib/hunspell/src/hunspell/dictmgr.hxx
similarity index 100%
rename from hunspell/src/hunspell/dictmgr.hxx
rename to contrib/hunspell/src/hunspell/dictmgr.hxx
diff --git a/hunspell/src/hunspell/hashmgr.cxx b/contrib/hunspell/src/hunspell/hashmgr.cxx
similarity index 100%
rename from hunspell/src/hunspell/hashmgr.cxx
rename to contrib/hunspell/src/hunspell/hashmgr.cxx
diff --git a/hunspell/src/hunspell/hashmgr.hxx b/contrib/hunspell/src/hunspell/hashmgr.hxx
similarity index 100%
rename from hunspell/src/hunspell/hashmgr.hxx
rename to contrib/hunspell/src/hunspell/hashmgr.hxx
diff --git a/hunspell/src/hunspell/htypes.hxx b/contrib/hunspell/src/hunspell/htypes.hxx
similarity index 100%
rename from hunspell/src/hunspell/htypes.hxx
rename to contrib/hunspell/src/hunspell/htypes.hxx
diff --git a/hunspell/src/hunspell/hunspell.cxx b/contrib/hunspell/src/hunspell/hunspell.cxx
similarity index 100%
rename from hunspell/src/hunspell/hunspell.cxx
rename to contrib/hunspell/src/hunspell/hunspell.cxx
diff --git a/hunspell/src/hunspell/hunspell.h b/contrib/hunspell/src/hunspell/hunspell.h
similarity index 100%
rename from hunspell/src/hunspell/hunspell.h
rename to contrib/hunspell/src/hunspell/hunspell.h
diff --git a/hunspell/src/hunspell/hunspell.hxx b/contrib/hunspell/src/hunspell/hunspell.hxx
similarity index 100%
rename from hunspell/src/hunspell/hunspell.hxx
rename to contrib/hunspell/src/hunspell/hunspell.hxx
diff --git a/hunspell/src/hunspell/langnum.hxx b/contrib/hunspell/src/hunspell/langnum.hxx
similarity index 100%
rename from hunspell/src/hunspell/langnum.hxx
rename to contrib/hunspell/src/hunspell/langnum.hxx
diff --git a/hunspell/src/hunspell/license.hunspell b/contrib/hunspell/src/hunspell/license.hunspell
similarity index 100%
rename from hunspell/src/hunspell/license.hunspell
rename to contrib/hunspell/src/hunspell/license.hunspell
diff --git a/hunspell/src/hunspell/license.myspell b/contrib/hunspell/src/hunspell/license.myspell
similarity index 100%
rename from hunspell/src/hunspell/license.myspell
rename to contrib/hunspell/src/hunspell/license.myspell
diff --git a/hunspell/src/hunspell/makefile.mk b/contrib/hunspell/src/hunspell/makefile.mk
similarity index 100%
rename from hunspell/src/hunspell/makefile.mk
rename to contrib/hunspell/src/hunspell/makefile.mk
diff --git a/hunspell/src/hunspell/phonet.cxx b/contrib/hunspell/src/hunspell/phonet.cxx
similarity index 100%
rename from hunspell/src/hunspell/phonet.cxx
rename to contrib/hunspell/src/hunspell/phonet.cxx
diff --git a/hunspell/src/hunspell/phonet.hxx b/contrib/hunspell/src/hunspell/phonet.hxx
similarity index 100%
rename from hunspell/src/hunspell/phonet.hxx
rename to contrib/hunspell/src/hunspell/phonet.hxx
diff --git a/hunspell/src/hunspell/suggestmgr.cxx b/contrib/hunspell/src/hunspell/suggestmgr.cxx
similarity index 100%
rename from hunspell/src/hunspell/suggestmgr.cxx
rename to contrib/hunspell/src/hunspell/suggestmgr.cxx
diff --git a/hunspell/src/hunspell/suggestmgr.hxx b/contrib/hunspell/src/hunspell/suggestmgr.hxx
similarity index 100%
rename from hunspell/src/hunspell/suggestmgr.hxx
rename to contrib/hunspell/src/hunspell/suggestmgr.hxx
diff --git a/hunspell/src/hunspell/utf_info.cxx b/contrib/hunspell/src/hunspell/utf_info.cxx
similarity index 100%
rename from hunspell/src/hunspell/utf_info.cxx
rename to contrib/hunspell/src/hunspell/utf_info.cxx
diff --git a/hunspell/src/parsers/Makefile.am b/contrib/hunspell/src/parsers/Makefile.am
similarity index 100%
rename from hunspell/src/parsers/Makefile.am
rename to contrib/hunspell/src/parsers/Makefile.am
diff --git a/hunspell/src/parsers/Makefile.in b/contrib/hunspell/src/parsers/Makefile.in
similarity index 100%
rename from hunspell/src/parsers/Makefile.in
rename to contrib/hunspell/src/parsers/Makefile.in
diff --git a/hunspell/src/parsers/firstparser.cxx b/contrib/hunspell/src/parsers/firstparser.cxx
similarity index 100%
rename from hunspell/src/parsers/firstparser.cxx
rename to contrib/hunspell/src/parsers/firstparser.cxx
diff --git a/hunspell/src/parsers/firstparser.hxx b/contrib/hunspell/src/parsers/firstparser.hxx
similarity index 100%
rename from hunspell/src/parsers/firstparser.hxx
rename to contrib/hunspell/src/parsers/firstparser.hxx
diff --git a/hunspell/src/parsers/htmlparser.cxx b/contrib/hunspell/src/parsers/htmlparser.cxx
similarity index 100%
rename from hunspell/src/parsers/htmlparser.cxx
rename to contrib/hunspell/src/parsers/htmlparser.cxx
diff --git a/hunspell/src/parsers/htmlparser.hxx b/contrib/hunspell/src/parsers/htmlparser.hxx
similarity index 100%
rename from hunspell/src/parsers/htmlparser.hxx
rename to contrib/hunspell/src/parsers/htmlparser.hxx
diff --git a/hunspell/src/parsers/latexparser.cxx b/contrib/hunspell/src/parsers/latexparser.cxx
similarity index 100%
rename from hunspell/src/parsers/latexparser.cxx
rename to contrib/hunspell/src/parsers/latexparser.cxx
diff --git a/hunspell/src/parsers/latexparser.hxx b/contrib/hunspell/src/parsers/latexparser.hxx
similarity index 100%
rename from hunspell/src/parsers/latexparser.hxx
rename to contrib/hunspell/src/parsers/latexparser.hxx
diff --git a/hunspell/src/parsers/manparser.cxx b/contrib/hunspell/src/parsers/manparser.cxx
similarity index 100%
rename from hunspell/src/parsers/manparser.cxx
rename to contrib/hunspell/src/parsers/manparser.cxx
diff --git a/hunspell/src/parsers/manparser.hxx b/contrib/hunspell/src/parsers/manparser.hxx
similarity index 100%
rename from hunspell/src/parsers/manparser.hxx
rename to contrib/hunspell/src/parsers/manparser.hxx
diff --git a/hunspell/src/parsers/testparser.cxx b/contrib/hunspell/src/parsers/testparser.cxx
similarity index 100%
rename from hunspell/src/parsers/testparser.cxx
rename to contrib/hunspell/src/parsers/testparser.cxx
diff --git a/hunspell/src/parsers/textparser.cxx b/contrib/hunspell/src/parsers/textparser.cxx
similarity index 100%
rename from hunspell/src/parsers/textparser.cxx
rename to contrib/hunspell/src/parsers/textparser.cxx
diff --git a/hunspell/src/parsers/textparser.hxx b/contrib/hunspell/src/parsers/textparser.hxx
similarity index 100%
rename from hunspell/src/parsers/textparser.hxx
rename to contrib/hunspell/src/parsers/textparser.hxx
diff --git a/hunspell/src/win_api/Hunspell.rc b/contrib/hunspell/src/win_api/Hunspell.rc
similarity index 100%
rename from hunspell/src/win_api/Hunspell.rc
rename to contrib/hunspell/src/win_api/Hunspell.rc
diff --git a/hunspell/src/win_api/config.h b/contrib/hunspell/src/win_api/config.h
similarity index 100%
rename from hunspell/src/win_api/config.h
rename to contrib/hunspell/src/win_api/config.h
diff --git a/hunspell/src/win_api/hunspelldll.c b/contrib/hunspell/src/win_api/hunspelldll.c
similarity index 100%
rename from hunspell/src/win_api/hunspelldll.c
rename to contrib/hunspell/src/win_api/hunspelldll.c
diff --git a/hunspell/src/win_api/hunspelldll.h b/contrib/hunspell/src/win_api/hunspelldll.h
similarity index 100%
rename from hunspell/src/win_api/hunspelldll.h
rename to contrib/hunspell/src/win_api/hunspelldll.h
diff --git a/hunspell/src/win_api/libhunspell.vcproj b/contrib/hunspell/src/win_api/libhunspell.vcproj
similarity index 100%
rename from hunspell/src/win_api/libhunspell.vcproj
rename to contrib/hunspell/src/win_api/libhunspell.vcproj
diff --git a/hunspell/src/win_api/libhunspell_2008.vcproj b/contrib/hunspell/src/win_api/libhunspell_2008.vcproj
similarity index 100%
rename from hunspell/src/win_api/libhunspell_2008.vcproj
rename to contrib/hunspell/src/win_api/libhunspell_2008.vcproj
diff --git a/lua51/COPYRIGHT b/contrib/lua51/COPYRIGHT
similarity index 100%
rename from lua51/COPYRIGHT
rename to contrib/lua51/COPYRIGHT
diff --git a/lua51/HISTORY b/contrib/lua51/HISTORY
similarity index 100%
rename from lua51/HISTORY
rename to contrib/lua51/HISTORY
diff --git a/lua51/INSTALL b/contrib/lua51/INSTALL
similarity index 100%
rename from lua51/INSTALL
rename to contrib/lua51/INSTALL
diff --git a/lua51/MANIFEST b/contrib/lua51/MANIFEST
similarity index 100%
rename from lua51/MANIFEST
rename to contrib/lua51/MANIFEST
diff --git a/lua51/Makefile b/contrib/lua51/Makefile
similarity index 100%
rename from lua51/Makefile
rename to contrib/lua51/Makefile
diff --git a/lua51/README b/contrib/lua51/README
similarity index 100%
rename from lua51/README
rename to contrib/lua51/README
diff --git a/lua51/README.Aegisub b/contrib/lua51/README.Aegisub
similarity index 100%
rename from lua51/README.Aegisub
rename to contrib/lua51/README.Aegisub
diff --git a/lua51/doc/contents.html b/contrib/lua51/doc/contents.html
similarity index 100%
rename from lua51/doc/contents.html
rename to contrib/lua51/doc/contents.html
diff --git a/lua51/doc/logo.gif b/contrib/lua51/doc/logo.gif
similarity index 100%
rename from lua51/doc/logo.gif
rename to contrib/lua51/doc/logo.gif
diff --git a/lua51/doc/lua.css b/contrib/lua51/doc/lua.css
similarity index 100%
rename from lua51/doc/lua.css
rename to contrib/lua51/doc/lua.css
diff --git a/lua51/doc/manual.html b/contrib/lua51/doc/manual.html
similarity index 100%
rename from lua51/doc/manual.html
rename to contrib/lua51/doc/manual.html
diff --git a/lua51/doc/readme.html b/contrib/lua51/doc/readme.html
similarity index 100%
rename from lua51/doc/readme.html
rename to contrib/lua51/doc/readme.html
diff --git a/lua51/lua51.vcproj b/contrib/lua51/lua51.vcproj
similarity index 100%
rename from lua51/lua51.vcproj
rename to contrib/lua51/lua51.vcproj
diff --git a/lua51/lua51_vc8.vcproj b/contrib/lua51/lua51_vc8.vcproj
similarity index 100%
rename from lua51/lua51_vc8.vcproj
rename to contrib/lua51/lua51_vc8.vcproj
diff --git a/lua51/lua51_vc9.vcproj b/contrib/lua51/lua51_vc9.vcproj
similarity index 100%
rename from lua51/lua51_vc9.vcproj
rename to contrib/lua51/lua51_vc9.vcproj
diff --git a/lua51/src/Makefile b/contrib/lua51/src/Makefile
similarity index 100%
rename from lua51/src/Makefile
rename to contrib/lua51/src/Makefile
diff --git a/lua51/src/lapi.c b/contrib/lua51/src/lapi.c
similarity index 100%
rename from lua51/src/lapi.c
rename to contrib/lua51/src/lapi.c
diff --git a/lua51/src/lapi.h b/contrib/lua51/src/lapi.h
similarity index 100%
rename from lua51/src/lapi.h
rename to contrib/lua51/src/lapi.h
diff --git a/lua51/src/lauxlib.c b/contrib/lua51/src/lauxlib.c
similarity index 100%
rename from lua51/src/lauxlib.c
rename to contrib/lua51/src/lauxlib.c
diff --git a/lua51/src/lauxlib.h b/contrib/lua51/src/lauxlib.h
similarity index 100%
rename from lua51/src/lauxlib.h
rename to contrib/lua51/src/lauxlib.h
diff --git a/lua51/src/lbaselib.c b/contrib/lua51/src/lbaselib.c
similarity index 100%
rename from lua51/src/lbaselib.c
rename to contrib/lua51/src/lbaselib.c
diff --git a/lua51/src/lcode.c b/contrib/lua51/src/lcode.c
similarity index 100%
rename from lua51/src/lcode.c
rename to contrib/lua51/src/lcode.c
diff --git a/lua51/src/lcode.h b/contrib/lua51/src/lcode.h
similarity index 100%
rename from lua51/src/lcode.h
rename to contrib/lua51/src/lcode.h
diff --git a/lua51/src/ldblib.c b/contrib/lua51/src/ldblib.c
similarity index 100%
rename from lua51/src/ldblib.c
rename to contrib/lua51/src/ldblib.c
diff --git a/lua51/src/ldebug.c b/contrib/lua51/src/ldebug.c
similarity index 100%
rename from lua51/src/ldebug.c
rename to contrib/lua51/src/ldebug.c
diff --git a/lua51/src/ldebug.h b/contrib/lua51/src/ldebug.h
similarity index 100%
rename from lua51/src/ldebug.h
rename to contrib/lua51/src/ldebug.h
diff --git a/lua51/src/ldo.c b/contrib/lua51/src/ldo.c
similarity index 100%
rename from lua51/src/ldo.c
rename to contrib/lua51/src/ldo.c
diff --git a/lua51/src/ldo.h b/contrib/lua51/src/ldo.h
similarity index 100%
rename from lua51/src/ldo.h
rename to contrib/lua51/src/ldo.h
diff --git a/lua51/src/ldump.c b/contrib/lua51/src/ldump.c
similarity index 100%
rename from lua51/src/ldump.c
rename to contrib/lua51/src/ldump.c
diff --git a/lua51/src/lfunc.c b/contrib/lua51/src/lfunc.c
similarity index 100%
rename from lua51/src/lfunc.c
rename to contrib/lua51/src/lfunc.c
diff --git a/lua51/src/lfunc.h b/contrib/lua51/src/lfunc.h
similarity index 100%
rename from lua51/src/lfunc.h
rename to contrib/lua51/src/lfunc.h
diff --git a/lua51/src/lgc.c b/contrib/lua51/src/lgc.c
similarity index 100%
rename from lua51/src/lgc.c
rename to contrib/lua51/src/lgc.c
diff --git a/lua51/src/lgc.h b/contrib/lua51/src/lgc.h
similarity index 100%
rename from lua51/src/lgc.h
rename to contrib/lua51/src/lgc.h
diff --git a/lua51/src/linit.c b/contrib/lua51/src/linit.c
similarity index 100%
rename from lua51/src/linit.c
rename to contrib/lua51/src/linit.c
diff --git a/lua51/src/liolib.c b/contrib/lua51/src/liolib.c
similarity index 100%
rename from lua51/src/liolib.c
rename to contrib/lua51/src/liolib.c
diff --git a/lua51/src/llex.c b/contrib/lua51/src/llex.c
similarity index 100%
rename from lua51/src/llex.c
rename to contrib/lua51/src/llex.c
diff --git a/lua51/src/llex.h b/contrib/lua51/src/llex.h
similarity index 100%
rename from lua51/src/llex.h
rename to contrib/lua51/src/llex.h
diff --git a/lua51/src/llimits.h b/contrib/lua51/src/llimits.h
similarity index 100%
rename from lua51/src/llimits.h
rename to contrib/lua51/src/llimits.h
diff --git a/lua51/src/lmathlib.c b/contrib/lua51/src/lmathlib.c
similarity index 100%
rename from lua51/src/lmathlib.c
rename to contrib/lua51/src/lmathlib.c
diff --git a/lua51/src/lmem.c b/contrib/lua51/src/lmem.c
similarity index 100%
rename from lua51/src/lmem.c
rename to contrib/lua51/src/lmem.c
diff --git a/lua51/src/lmem.h b/contrib/lua51/src/lmem.h
similarity index 100%
rename from lua51/src/lmem.h
rename to contrib/lua51/src/lmem.h
diff --git a/lua51/src/loadlib.c b/contrib/lua51/src/loadlib.c
similarity index 100%
rename from lua51/src/loadlib.c
rename to contrib/lua51/src/loadlib.c
diff --git a/lua51/src/lobject.c b/contrib/lua51/src/lobject.c
similarity index 100%
rename from lua51/src/lobject.c
rename to contrib/lua51/src/lobject.c
diff --git a/lua51/src/lobject.h b/contrib/lua51/src/lobject.h
similarity index 100%
rename from lua51/src/lobject.h
rename to contrib/lua51/src/lobject.h
diff --git a/lua51/src/lopcodes.c b/contrib/lua51/src/lopcodes.c
similarity index 100%
rename from lua51/src/lopcodes.c
rename to contrib/lua51/src/lopcodes.c
diff --git a/lua51/src/lopcodes.h b/contrib/lua51/src/lopcodes.h
similarity index 100%
rename from lua51/src/lopcodes.h
rename to contrib/lua51/src/lopcodes.h
diff --git a/lua51/src/loslib.c b/contrib/lua51/src/loslib.c
similarity index 100%
rename from lua51/src/loslib.c
rename to contrib/lua51/src/loslib.c
diff --git a/lua51/src/lparser.c b/contrib/lua51/src/lparser.c
similarity index 100%
rename from lua51/src/lparser.c
rename to contrib/lua51/src/lparser.c
diff --git a/lua51/src/lparser.h b/contrib/lua51/src/lparser.h
similarity index 100%
rename from lua51/src/lparser.h
rename to contrib/lua51/src/lparser.h
diff --git a/lua51/src/lstate.c b/contrib/lua51/src/lstate.c
similarity index 100%
rename from lua51/src/lstate.c
rename to contrib/lua51/src/lstate.c
diff --git a/lua51/src/lstate.h b/contrib/lua51/src/lstate.h
similarity index 100%
rename from lua51/src/lstate.h
rename to contrib/lua51/src/lstate.h
diff --git a/lua51/src/lstring.c b/contrib/lua51/src/lstring.c
similarity index 100%
rename from lua51/src/lstring.c
rename to contrib/lua51/src/lstring.c
diff --git a/lua51/src/lstring.h b/contrib/lua51/src/lstring.h
similarity index 100%
rename from lua51/src/lstring.h
rename to contrib/lua51/src/lstring.h
diff --git a/lua51/src/lstrlib.c b/contrib/lua51/src/lstrlib.c
similarity index 100%
rename from lua51/src/lstrlib.c
rename to contrib/lua51/src/lstrlib.c
diff --git a/lua51/src/ltable.c b/contrib/lua51/src/ltable.c
similarity index 100%
rename from lua51/src/ltable.c
rename to contrib/lua51/src/ltable.c
diff --git a/lua51/src/ltable.h b/contrib/lua51/src/ltable.h
similarity index 100%
rename from lua51/src/ltable.h
rename to contrib/lua51/src/ltable.h
diff --git a/lua51/src/ltablib.c b/contrib/lua51/src/ltablib.c
similarity index 100%
rename from lua51/src/ltablib.c
rename to contrib/lua51/src/ltablib.c
diff --git a/lua51/src/ltm.c b/contrib/lua51/src/ltm.c
similarity index 100%
rename from lua51/src/ltm.c
rename to contrib/lua51/src/ltm.c
diff --git a/lua51/src/ltm.h b/contrib/lua51/src/ltm.h
similarity index 100%
rename from lua51/src/ltm.h
rename to contrib/lua51/src/ltm.h
diff --git a/lua51/src/lua.h b/contrib/lua51/src/lua.h
similarity index 100%
rename from lua51/src/lua.h
rename to contrib/lua51/src/lua.h
diff --git a/lua51/src/luaconf.h b/contrib/lua51/src/luaconf.h
similarity index 100%
rename from lua51/src/luaconf.h
rename to contrib/lua51/src/luaconf.h
diff --git a/lua51/src/lualib.h b/contrib/lua51/src/lualib.h
similarity index 100%
rename from lua51/src/lualib.h
rename to contrib/lua51/src/lualib.h
diff --git a/lua51/src/lundump.c b/contrib/lua51/src/lundump.c
similarity index 100%
rename from lua51/src/lundump.c
rename to contrib/lua51/src/lundump.c
diff --git a/lua51/src/lundump.h b/contrib/lua51/src/lundump.h
similarity index 100%
rename from lua51/src/lundump.h
rename to contrib/lua51/src/lundump.h
diff --git a/lua51/src/lvm.c b/contrib/lua51/src/lvm.c
similarity index 100%
rename from lua51/src/lvm.c
rename to contrib/lua51/src/lvm.c
diff --git a/lua51/src/lvm.h b/contrib/lua51/src/lvm.h
similarity index 100%
rename from lua51/src/lvm.h
rename to contrib/lua51/src/lvm.h
diff --git a/lua51/src/lzio.c b/contrib/lua51/src/lzio.c
similarity index 100%
rename from lua51/src/lzio.c
rename to contrib/lua51/src/lzio.c
diff --git a/lua51/src/lzio.h b/contrib/lua51/src/lzio.h
similarity index 100%
rename from lua51/src/lzio.h
rename to contrib/lua51/src/lzio.h