diff --git a/.gitignore b/.gitignore
index b7d80e91..82a02a59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ docwarnings.log
packages
/data
-/resource
/*.dll
/old
diff --git a/src/resource/common/about.png b/resource/about.png
similarity index 100%
rename from src/resource/common/about.png
rename to resource/about.png
diff --git a/src/resource/common/bool_no.png b/resource/bool_no.png
similarity index 100%
rename from src/resource/common/bool_no.png
rename to resource/bool_no.png
diff --git a/src/resource/common/bool_yes.png b/resource/bool_yes.png
similarity index 100%
rename from src/resource/common/bool_yes.png
rename to resource/bool_yes.png
diff --git a/src/resource/common/btn_clear_filter_down.png b/resource/btn_clear_filter_down.png
similarity index 100%
rename from src/resource/common/btn_clear_filter_down.png
rename to resource/btn_clear_filter_down.png
diff --git a/src/resource/common/btn_clear_filter_focus.png b/resource/btn_clear_filter_focus.png
similarity index 100%
rename from src/resource/common/btn_clear_filter_focus.png
rename to resource/btn_clear_filter_focus.png
diff --git a/src/resource/common/btn_clear_filter_hover.png b/resource/btn_clear_filter_hover.png
similarity index 100%
rename from src/resource/common/btn_clear_filter_hover.png
rename to resource/btn_clear_filter_hover.png
diff --git a/src/resource/common/btn_clear_filter_normal.png b/resource/btn_clear_filter_normal.png
similarity index 100%
rename from src/resource/common/btn_clear_filter_normal.png
rename to resource/btn_clear_filter_normal.png
diff --git a/src/resource/common/btn_collapse_down.png b/resource/btn_collapse_down.png
similarity index 100%
rename from src/resource/common/btn_collapse_down.png
rename to resource/btn_collapse_down.png
diff --git a/src/resource/common/btn_collapse_focus.png b/resource/btn_collapse_focus.png
similarity index 100%
rename from src/resource/common/btn_collapse_focus.png
rename to resource/btn_collapse_focus.png
diff --git a/src/resource/common/btn_collapse_hover.png b/resource/btn_collapse_hover.png
similarity index 100%
rename from src/resource/common/btn_collapse_hover.png
rename to resource/btn_collapse_hover.png
diff --git a/src/resource/common/btn_collapse_normal.png b/resource/btn_collapse_normal.png
similarity index 100%
rename from src/resource/common/btn_collapse_normal.png
rename to resource/btn_collapse_normal.png
diff --git a/src/resource/common/btn_down.png b/resource/btn_down.png
similarity index 100%
rename from src/resource/common/btn_down.png
rename to resource/btn_down.png
diff --git a/src/resource/common/btn_expand_down.png b/resource/btn_expand_down.png
similarity index 100%
rename from src/resource/common/btn_expand_down.png
rename to resource/btn_expand_down.png
diff --git a/src/resource/common/btn_expand_focus.png b/resource/btn_expand_focus.png
similarity index 100%
rename from src/resource/common/btn_expand_focus.png
rename to resource/btn_expand_focus.png
diff --git a/src/resource/common/btn_expand_hover.png b/resource/btn_expand_hover.png
similarity index 100%
rename from src/resource/common/btn_expand_hover.png
rename to resource/btn_expand_hover.png
diff --git a/src/resource/common/btn_expand_normal.png b/resource/btn_expand_normal.png
similarity index 100%
rename from src/resource/common/btn_expand_normal.png
rename to resource/btn_expand_normal.png
diff --git a/src/resource/common/btn_focus.png b/resource/btn_focus.png
similarity index 100%
rename from src/resource/common/btn_focus.png
rename to resource/btn_focus.png
diff --git a/src/resource/common/btn_hover.png b/resource/btn_hover.png
similarity index 100%
rename from src/resource/common/btn_hover.png
rename to resource/btn_hover.png
diff --git a/src/resource/common/btn_normal.png b/resource/btn_normal.png
similarity index 100%
rename from src/resource/common/btn_normal.png
rename to resource/btn_normal.png
diff --git a/src/resource/common/btn_ok_down.png b/resource/btn_ok_down.png
similarity index 100%
rename from src/resource/common/btn_ok_down.png
rename to resource/btn_ok_down.png
diff --git a/src/resource/common/btn_ok_focus.png b/resource/btn_ok_focus.png
similarity index 100%
rename from src/resource/common/btn_ok_focus.png
rename to resource/btn_ok_focus.png
diff --git a/src/resource/common/btn_ok_hover.png b/resource/btn_ok_hover.png
similarity index 100%
rename from src/resource/common/btn_ok_hover.png
rename to resource/btn_ok_hover.png
diff --git a/src/resource/common/btn_ok_normal.png b/resource/btn_ok_normal.png
similarity index 100%
rename from src/resource/common/btn_ok_normal.png
rename to resource/btn_ok_normal.png
diff --git a/src/resource/common/combine_and.png b/resource/combine_and.png
similarity index 100%
rename from src/resource/common/combine_and.png
rename to resource/combine_and.png
diff --git a/src/resource/common/combine_and_dark.png b/resource/combine_and_dark.png
similarity index 100%
rename from src/resource/common/combine_and_dark.png
rename to resource/combine_and_dark.png
diff --git a/src/resource/common/combine_border.png b/resource/combine_border.png
similarity index 100%
rename from src/resource/common/combine_border.png
rename to resource/combine_border.png
diff --git a/src/resource/common/combine_or.png b/resource/combine_or.png
similarity index 100%
rename from src/resource/common/combine_or.png
rename to resource/combine_or.png
diff --git a/src/resource/common/combine_over.png b/resource/combine_over.png
similarity index 100%
rename from src/resource/common/combine_over.png
rename to resource/combine_over.png
diff --git a/src/resource/common/combine_sub.png b/resource/combine_sub.png
similarity index 100%
rename from src/resource/common/combine_sub.png
rename to resource/combine_sub.png
diff --git a/src/resource/common/combine_sub_dark.png b/resource/combine_sub_dark.png
similarity index 100%
rename from src/resource/common/combine_sub_dark.png
rename to resource/combine_sub_dark.png
diff --git a/src/resource/common/combine_xor.png b/resource/combine_xor.png
similarity index 100%
rename from src/resource/common/combine_xor.png
rename to resource/combine_xor.png
diff --git a/src/resource/msw/cursor/curve.cur b/resource/cursor/curve.cur
similarity index 100%
rename from src/resource/msw/cursor/curve.cur
rename to resource/cursor/curve.cur
diff --git a/src/resource/msw/cursor/point.cur b/resource/cursor/point.cur
similarity index 100%
rename from src/resource/msw/cursor/point.cur
rename to resource/cursor/point.cur
diff --git a/src/resource/msw/cursor/point_add.cur b/resource/cursor/point_add.cur
similarity index 100%
rename from src/resource/msw/cursor/point_add.cur
rename to resource/cursor/point_add.cur
diff --git a/src/resource/msw/cursor/point_move.cur b/resource/cursor/point_move.cur
similarity index 100%
rename from src/resource/msw/cursor/point_move.cur
rename to resource/cursor/point_move.cur
diff --git a/src/resource/msw/cursor/rot_text.cur b/resource/cursor/rot_text.cur
similarity index 100%
rename from src/resource/msw/cursor/rot_text.cur
rename to resource/cursor/rot_text.cur
diff --git a/src/resource/msw/cursor/rotate.cur b/resource/cursor/rotate.cur
similarity index 100%
rename from src/resource/msw/cursor/rotate.cur
rename to resource/cursor/rotate.cur
diff --git a/src/resource/msw/cursor/shear_x.cur b/resource/cursor/shear_x.cur
similarity index 100%
rename from src/resource/msw/cursor/shear_x.cur
rename to resource/cursor/shear_x.cur
diff --git a/src/resource/msw/cursor/shear_y.cur b/resource/cursor/shear_y.cur
similarity index 100%
rename from src/resource/msw/cursor/shear_y.cur
rename to resource/cursor/shear_y.cur
diff --git a/src/resource/common/edit_symbol.png b/resource/edit_symbol.png
similarity index 100%
rename from src/resource/common/edit_symbol.png
rename to resource/edit_symbol.png
diff --git a/src/resource/common/expected_locale_keys b/resource/expected_locale_keys
similarity index 100%
rename from src/resource/common/expected_locale_keys
rename to resource/expected_locale_keys
diff --git a/src/resource/common/handle_center.png b/resource/handle_center.png
similarity index 100%
rename from src/resource/common/handle_center.png
rename to resource/handle_center.png
diff --git a/src/resource/common/handle_rotate.png b/resource/handle_rotate.png
similarity index 100%
rename from src/resource/common/handle_rotate.png
rename to resource/handle_rotate.png
diff --git a/src/resource/common/handle_shear_x.png b/resource/handle_shear_x.png
similarity index 100%
rename from src/resource/common/handle_shear_x.png
rename to resource/handle_shear_x.png
diff --git a/src/resource/msw/icon/app.ico b/resource/icon/app.ico
similarity index 100%
rename from src/resource/msw/icon/app.ico
rename to resource/icon/app.ico
diff --git a/src/resource/msw/icon/installer.ico b/resource/icon/installer.ico
similarity index 100%
rename from src/resource/msw/icon/installer.ico
rename to resource/icon/installer.ico
diff --git a/src/resource/msw/icon/set.ico b/resource/icon/set.ico
similarity index 100%
rename from src/resource/msw/icon/set.ico
rename to resource/icon/set.ico
diff --git a/src/resource/msw/icon/symbol.ico b/resource/icon/symbol.ico
similarity index 100%
rename from src/resource/msw/icon/symbol.ico
rename to resource/icon/symbol.ico
diff --git a/src/resource/common/icon_combine_border.png b/resource/icon_combine_border.png
similarity index 100%
rename from src/resource/common/icon_combine_border.png
rename to resource/icon_combine_border.png
diff --git a/src/resource/common/icon_combine_difference.png b/resource/icon_combine_difference.png
similarity index 100%
rename from src/resource/common/icon_combine_difference.png
rename to resource/icon_combine_difference.png
diff --git a/src/resource/common/icon_combine_intersection.png b/resource/icon_combine_intersection.png
similarity index 100%
rename from src/resource/common/icon_combine_intersection.png
rename to resource/icon_combine_intersection.png
diff --git a/src/resource/common/icon_combine_merge.png b/resource/icon_combine_merge.png
similarity index 100%
rename from src/resource/common/icon_combine_merge.png
rename to resource/icon_combine_merge.png
diff --git a/src/resource/common/icon_combine_overlap.png b/resource/icon_combine_overlap.png
similarity index 100%
rename from src/resource/common/icon_combine_overlap.png
rename to resource/icon_combine_overlap.png
diff --git a/src/resource/common/icon_combine_subtract.png b/resource/icon_combine_subtract.png
similarity index 100%
rename from src/resource/common/icon_combine_subtract.png
rename to resource/icon_combine_subtract.png
diff --git a/src/resource/common/icon_symbol_group.png b/resource/icon_symbol_group.png
similarity index 100%
rename from src/resource/common/icon_symbol_group.png
rename to resource/icon_symbol_group.png
diff --git a/src/resource/common/icon_symmetry_reflection.png b/resource/icon_symmetry_reflection.png
similarity index 100%
rename from src/resource/common/icon_symmetry_reflection.png
rename to resource/icon_symmetry_reflection.png
diff --git a/src/resource/common/icon_symmetry_rotation.png b/resource/icon_symmetry_rotation.png
similarity index 100%
rename from src/resource/common/icon_symmetry_rotation.png
rename to resource/icon_symmetry_rotation.png
diff --git a/src/resource/common/installer_font.png b/resource/installer_font.png
similarity index 100%
rename from src/resource/common/installer_font.png
rename to resource/installer_font.png
diff --git a/src/resource/common/installer_group.png b/resource/installer_group.png
similarity index 100%
rename from src/resource/common/installer_group.png
rename to resource/installer_group.png
diff --git a/src/resource/common/installer_locales.png b/resource/installer_locales.png
similarity index 100%
rename from src/resource/common/installer_locales.png
rename to resource/installer_locales.png
diff --git a/src/resource/common/installer_package.png b/resource/installer_package.png
similarity index 100%
rename from src/resource/common/installer_package.png
rename to resource/installer_package.png
diff --git a/src/resource/common/installer_program.png b/resource/installer_program.png
similarity index 100%
rename from src/resource/common/installer_program.png
rename to resource/installer_program.png
diff --git a/src/resource/common/message_error.png b/resource/message_error.png
similarity index 100%
rename from src/resource/common/message_error.png
rename to resource/message_error.png
diff --git a/src/resource/common/message_information.png b/resource/message_information.png
similarity index 100%
rename from src/resource/common/message_information.png
rename to resource/message_information.png
diff --git a/src/resource/common/message_input.png b/resource/message_input.png
similarity index 100%
rename from src/resource/common/message_input.png
rename to resource/message_input.png
diff --git a/src/resource/common/message_warning.png b/resource/message_warning.png
similarity index 100%
rename from src/resource/common/message_warning.png
rename to resource/message_warning.png
diff --git a/src/resource/msw/other/minus.png b/resource/minus.png
similarity index 100%
rename from src/resource/msw/other/minus.png
rename to resource/minus.png
diff --git a/src/resource/msw/other/plus.png b/resource/plus.png
similarity index 100%
rename from src/resource/msw/other/plus.png
rename to resource/plus.png
diff --git a/src/resource/msw/other/selected_no.png b/resource/selected_no.png
similarity index 100%
rename from src/resource/msw/other/selected_no.png
rename to resource/selected_no.png
diff --git a/src/resource/msw/other/selected_yes.png b/resource/selected_yes.png
similarity index 100%
rename from src/resource/msw/other/selected_yes.png
rename to resource/selected_yes.png
diff --git a/src/resource/msw/other/sort_asc.png b/resource/sort_asc.png
similarity index 100%
rename from src/resource/msw/other/sort_asc.png
rename to resource/sort_asc.png
diff --git a/src/resource/msw/other/sort_desc.png b/resource/sort_desc.png
similarity index 100%
rename from src/resource/msw/other/sort_desc.png
rename to resource/sort_desc.png
diff --git a/src/resource/common/symbol_group.png b/resource/symbol_group.png
similarity index 100%
rename from src/resource/common/symbol_group.png
rename to resource/symbol_group.png
diff --git a/src/resource/common/symmetry_reflection.png b/resource/symmetry_reflection.png
similarity index 100%
rename from src/resource/common/symmetry_reflection.png
rename to resource/symmetry_reflection.png
diff --git a/src/resource/common/symmetry_rotation.png b/resource/symmetry_rotation.png
similarity index 100%
rename from src/resource/common/symmetry_rotation.png
rename to resource/symmetry_rotation.png
diff --git a/src/resource/msw/tool/apply.png b/resource/tool/apply.png
similarity index 100%
rename from src/resource/msw/tool/apply.png
rename to resource/tool/apply.png
diff --git a/src/resource/msw/tool/bold.png b/resource/tool/bold.png
similarity index 100%
rename from src/resource/msw/tool/bold.png
rename to resource/tool/bold.png
diff --git a/src/resource/msw/tool/card_add.png b/resource/tool/card_add.png
similarity index 100%
rename from src/resource/msw/tool/card_add.png
rename to resource/tool/card_add.png
diff --git a/src/resource/msw/tool/card_add_multiple.png b/resource/tool/card_add_multiple.png
similarity index 100%
rename from src/resource/msw/tool/card_add_multiple.png
rename to resource/tool/card_add_multiple.png
diff --git a/src/resource/msw/tool/card_del.png b/resource/tool/card_del.png
similarity index 100%
rename from src/resource/msw/tool/card_del.png
rename to resource/tool/card_del.png
diff --git a/src/resource/msw/tool/card_rotate.png b/resource/tool/card_rotate.png
similarity index 100%
rename from src/resource/msw/tool/card_rotate.png
rename to resource/tool/card_rotate.png
diff --git a/src/resource/msw/tool/card_rotate_0.png b/resource/tool/card_rotate_0.png
similarity index 100%
rename from src/resource/msw/tool/card_rotate_0.png
rename to resource/tool/card_rotate_0.png
diff --git a/src/resource/msw/tool/card_rotate_180.png b/resource/tool/card_rotate_180.png
similarity index 100%
rename from src/resource/msw/tool/card_rotate_180.png
rename to resource/tool/card_rotate_180.png
diff --git a/src/resource/msw/tool/card_rotate_270.png b/resource/tool/card_rotate_270.png
similarity index 100%
rename from src/resource/msw/tool/card_rotate_270.png
rename to resource/tool/card_rotate_270.png
diff --git a/src/resource/msw/tool/card_rotate_90.png b/resource/tool/card_rotate_90.png
similarity index 100%
rename from src/resource/msw/tool/card_rotate_90.png
rename to resource/tool/card_rotate_90.png
diff --git a/src/resource/msw/tool/circle.png b/resource/tool/circle.png
similarity index 100%
rename from src/resource/msw/tool/circle.png
rename to resource/tool/circle.png
diff --git a/src/resource/msw/tool/copy.png b/resource/tool/copy.png
similarity index 100%
rename from src/resource/msw/tool/copy.png
rename to resource/tool/copy.png
diff --git a/src/resource/msw/tool/curve.png b/resource/tool/curve.png
similarity index 100%
rename from src/resource/msw/tool/curve.png
rename to resource/tool/curve.png
diff --git a/src/resource/msw/tool/cut.png b/resource/tool/cut.png
similarity index 100%
rename from src/resource/msw/tool/cut.png
rename to resource/tool/cut.png
diff --git a/src/resource/msw/tool/duplicate.png b/resource/tool/duplicate.png
similarity index 100%
rename from src/resource/msw/tool/duplicate.png
rename to resource/tool/duplicate.png
diff --git a/src/resource/msw/tool/export.png b/resource/tool/export.png
similarity index 100%
rename from src/resource/msw/tool/export.png
rename to resource/tool/export.png
diff --git a/src/resource/msw/tool/export_apprentice.png b/resource/tool/export_apprentice.png
similarity index 100%
rename from src/resource/msw/tool/export_apprentice.png
rename to resource/tool/export_apprentice.png
diff --git a/src/resource/msw/tool/export_html.png b/resource/tool/export_html.png
similarity index 100%
rename from src/resource/msw/tool/export_html.png
rename to resource/tool/export_html.png
diff --git a/src/resource/msw/tool/export_image.png b/resource/tool/export_image.png
similarity index 100%
rename from src/resource/msw/tool/export_image.png
rename to resource/tool/export_image.png
diff --git a/src/resource/msw/tool/export_images.png b/resource/tool/export_images.png
similarity index 100%
rename from src/resource/msw/tool/export_images.png
rename to resource/tool/export_images.png
diff --git a/src/resource/msw/tool/export_mws.png b/resource/tool/export_mws.png
similarity index 100%
rename from src/resource/msw/tool/export_mws.png
rename to resource/tool/export_mws.png
diff --git a/src/resource/msw/tool/find.png b/resource/tool/find.png
similarity index 100%
rename from src/resource/msw/tool/find.png
rename to resource/tool/find.png
diff --git a/src/resource/msw/tool/graph_bar.png b/resource/tool/graph_bar.png
similarity index 100%
rename from src/resource/msw/tool/graph_bar.png
rename to resource/tool/graph_bar.png
diff --git a/src/resource/msw/tool/graph_pie.png b/resource/tool/graph_pie.png
similarity index 100%
rename from src/resource/msw/tool/graph_pie.png
rename to resource/tool/graph_pie.png
diff --git a/src/resource/msw/tool/graph_scatter.png b/resource/tool/graph_scatter.png
similarity index 100%
rename from src/resource/msw/tool/graph_scatter.png
rename to resource/tool/graph_scatter.png
diff --git a/src/resource/msw/tool/graph_scatter_pie.png b/resource/tool/graph_scatter_pie.png
similarity index 100%
rename from src/resource/msw/tool/graph_scatter_pie.png
rename to resource/tool/graph_scatter_pie.png
diff --git a/src/resource/msw/tool/graph_stack.png b/resource/tool/graph_stack.png
similarity index 100%
rename from src/resource/msw/tool/graph_stack.png
rename to resource/tool/graph_stack.png
diff --git a/src/resource/msw/tool/grid.png b/resource/tool/grid.png
similarity index 100%
rename from src/resource/msw/tool/grid.png
rename to resource/tool/grid.png
diff --git a/src/resource/msw/tool/grid_snap.png b/resource/tool/grid_snap.png
similarity index 100%
rename from src/resource/msw/tool/grid_snap.png
rename to resource/tool/grid_snap.png
diff --git a/src/resource/msw/tool/group.png b/resource/tool/group.png
similarity index 100%
rename from src/resource/msw/tool/group.png
rename to resource/tool/group.png
diff --git a/src/resource/msw/tool/help.png b/resource/tool/help.png
similarity index 100%
rename from src/resource/msw/tool/help.png
rename to resource/tool/help.png
diff --git a/src/resource/msw/tool/italic.png b/resource/tool/italic.png
similarity index 100%
rename from src/resource/msw/tool/italic.png
rename to resource/tool/italic.png
diff --git a/src/resource/msw/tool/keyword_add.png b/resource/tool/keyword_add.png
similarity index 100%
rename from src/resource/msw/tool/keyword_add.png
rename to resource/tool/keyword_add.png
diff --git a/src/resource/msw/tool/keyword_del.png b/resource/tool/keyword_del.png
similarity index 100%
rename from src/resource/msw/tool/keyword_del.png
rename to resource/tool/keyword_del.png
diff --git a/src/resource/msw/tool/line.png b/resource/tool/line.png
similarity index 100%
rename from src/resource/msw/tool/line.png
rename to resource/tool/line.png
diff --git a/src/resource/msw/tool/lock_dir.png b/resource/tool/lock_dir.png
similarity index 100%
rename from src/resource/msw/tool/lock_dir.png
rename to resource/tool/lock_dir.png
diff --git a/src/resource/msw/tool/lock_free.png b/resource/tool/lock_free.png
similarity index 100%
rename from src/resource/msw/tool/lock_free.png
rename to resource/tool/lock_free.png
diff --git a/src/resource/msw/tool/lock_size.png b/resource/tool/lock_size.png
similarity index 100%
rename from src/resource/msw/tool/lock_size.png
rename to resource/tool/lock_size.png
diff --git a/src/resource/msw/tool/mode_curve.png b/resource/tool/mode_curve.png
similarity index 100%
rename from src/resource/msw/tool/mode_curve.png
rename to resource/tool/mode_curve.png
diff --git a/src/resource/msw/tool/mode_paint.png b/resource/tool/mode_paint.png
similarity index 100%
rename from src/resource/msw/tool/mode_paint.png
rename to resource/tool/mode_paint.png
diff --git a/src/resource/msw/tool/mode_rotate.png b/resource/tool/mode_rotate.png
similarity index 100%
rename from src/resource/msw/tool/mode_rotate.png
rename to resource/tool/mode_rotate.png
diff --git a/src/resource/msw/tool/mode_select.png b/resource/tool/mode_select.png
similarity index 100%
rename from src/resource/msw/tool/mode_select.png
rename to resource/tool/mode_select.png
diff --git a/src/resource/msw/tool/mode_symmetry.png b/resource/tool/mode_symmetry.png
similarity index 100%
rename from src/resource/msw/tool/mode_symmetry.png
rename to resource/tool/mode_symmetry.png
diff --git a/src/resource/msw/tool/new.png b/resource/tool/new.png
similarity index 100%
rename from src/resource/msw/tool/new.png
rename to resource/tool/new.png
diff --git a/src/resource/msw/tool/no_auto.png b/resource/tool/no_auto.png
similarity index 100%
rename from src/resource/msw/tool/no_auto.png
rename to resource/tool/no_auto.png
diff --git a/src/resource/msw/tool/open.png b/resource/tool/open.png
similarity index 100%
rename from src/resource/msw/tool/open.png
rename to resource/tool/open.png
diff --git a/src/resource/msw/tool/paste.png b/resource/tool/paste.png
similarity index 100%
rename from src/resource/msw/tool/paste.png
rename to resource/tool/paste.png
diff --git a/src/resource/msw/tool/print.png b/resource/tool/print.png
similarity index 100%
rename from src/resource/msw/tool/print.png
rename to resource/tool/print.png
diff --git a/src/resource/msw/tool/print_preview.png b/resource/tool/print_preview.png
similarity index 100%
rename from src/resource/msw/tool/print_preview.png
rename to resource/tool/print_preview.png
diff --git a/src/resource/msw/tool/rectangle.png b/resource/tool/rectangle.png
similarity index 100%
rename from src/resource/msw/tool/rectangle.png
rename to resource/tool/rectangle.png
diff --git a/src/resource/msw/tool/redo.png b/resource/tool/redo.png
similarity index 100%
rename from src/resource/msw/tool/redo.png
rename to resource/tool/redo.png
diff --git a/src/resource/msw/tool/reminder.png b/resource/tool/reminder.png
similarity index 100%
rename from src/resource/msw/tool/reminder.png
rename to resource/tool/reminder.png
diff --git a/src/resource/msw/tool/save.png b/resource/tool/save.png
similarity index 100%
rename from src/resource/msw/tool/save.png
rename to resource/tool/save.png
diff --git a/src/resource/msw/tool/star.png b/resource/tool/star.png
similarity index 100%
rename from src/resource/msw/tool/star.png
rename to resource/tool/star.png
diff --git a/src/resource/msw/tool/symbol.png b/resource/tool/symbol.png
similarity index 100%
rename from src/resource/msw/tool/symbol.png
rename to resource/tool/symbol.png
diff --git a/src/resource/msw/tool/symmetry_add.png b/resource/tool/symmetry_add.png
similarity index 100%
rename from src/resource/msw/tool/symmetry_add.png
rename to resource/tool/symmetry_add.png
diff --git a/src/resource/msw/tool/symmetry_remove.png b/resource/tool/symmetry_remove.png
similarity index 100%
rename from src/resource/msw/tool/symmetry_remove.png
rename to resource/tool/symmetry_remove.png
diff --git a/src/resource/msw/tool/triangle.png b/resource/tool/triangle.png
similarity index 100%
rename from src/resource/msw/tool/triangle.png
rename to resource/tool/triangle.png
diff --git a/src/resource/msw/tool/undo.png b/resource/tool/undo.png
similarity index 100%
rename from src/resource/msw/tool/undo.png
rename to resource/tool/undo.png
diff --git a/src/resource/msw/tool/ungroup.png b/resource/tool/ungroup.png
similarity index 100%
rename from src/resource/msw/tool/ungroup.png
rename to resource/tool/ungroup.png
diff --git a/src/resource/msw/tool/window_cards.png b/resource/tool/window_cards.png
similarity index 100%
rename from src/resource/msw/tool/window_cards.png
rename to resource/tool/window_cards.png
diff --git a/src/resource/msw/tool/window_console.png b/resource/tool/window_console.png
similarity index 100%
rename from src/resource/msw/tool/window_console.png
rename to resource/tool/window_console.png
diff --git a/src/resource/msw/tool/window_keywords.png b/resource/tool/window_keywords.png
similarity index 100%
rename from src/resource/msw/tool/window_keywords.png
rename to resource/tool/window_keywords.png
diff --git a/src/resource/msw/tool/window_random_pack.png b/resource/tool/window_random_pack.png
similarity index 100%
rename from src/resource/msw/tool/window_random_pack.png
rename to resource/tool/window_random_pack.png
diff --git a/src/resource/msw/tool/window_set_info.png b/resource/tool/window_set_info.png
similarity index 100%
rename from src/resource/msw/tool/window_set_info.png
rename to resource/tool/window_set_info.png
diff --git a/src/resource/msw/tool/window_statistics.png b/resource/tool/window_statistics.png
similarity index 100%
rename from src/resource/msw/tool/window_statistics.png
rename to resource/tool/window_statistics.png
diff --git a/src/resource/msw/tool/window_style.png b/resource/tool/window_style.png
similarity index 100%
rename from src/resource/msw/tool/window_style.png
rename to resource/tool/window_style.png
diff --git a/src/resource/common/two_beta.png b/resource/two_beta.png
similarity index 100%
rename from src/resource/common/two_beta.png
rename to resource/two_beta.png
diff --git a/src/resource/common/welcome_last.png b/resource/welcome_last.png
similarity index 100%
rename from src/resource/common/welcome_last.png
rename to resource/welcome_last.png
diff --git a/src/resource/common/welcome_new.png b/resource/welcome_new.png
similarity index 100%
rename from src/resource/common/welcome_new.png
rename to resource/welcome_new.png
diff --git a/src/resource/common/welcome_open.png b/resource/welcome_open.png
similarity index 100%
rename from src/resource/common/welcome_open.png
rename to resource/welcome_open.png
diff --git a/src/resource/common/welcome_updates.png b/resource/welcome_updates.png
similarity index 100%
rename from src/resource/common/welcome_updates.png
rename to resource/welcome_updates.png
diff --git a/src/mse.sln b/src/mse.sln
deleted file mode 100644
index 77dc5bd8..00000000
--- a/src/mse.sln
+++ /dev/null
@@ -1,35 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse", "mse.vcproj", "{DB9DCD62-4679-47DD-8BEE-8A0191161A51}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32-cli-wrapper", "win32-cli-wrapper.vcproj", "{BCAB273A-CEDE-440D-866D-21AAFEC60218}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug Unicode|Win32 = Debug Unicode|Win32
- Debug|Win32 = Debug|Win32
- Release Unicode|Win32 = Release Unicode|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Debug|Win32.ActiveCfg = Debug|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Debug|Win32.Build.0 = Debug|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Release|Win32.ActiveCfg = Release Unicode|Win32
- {DB9DCD62-4679-47DD-8BEE-8A0191161A51}.Release|Win32.Build.0 = Release Unicode|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug Unicode|Win32.Build.0 = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug|Win32.ActiveCfg = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug|Win32.Build.0 = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Unicode|Win32.ActiveCfg = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Unicode|Win32.Build.0 = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release|Win32.ActiveCfg = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/src/mse.vc71.sln b/src/mse.vc71.sln
deleted file mode 100644
index 4d9689e2..00000000
--- a/src/mse.vc71.sln
+++ /dev/null
@@ -1,54 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse", "mse.vc71.vcproj", "{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32-cli-wrapper", "win32-cli-wrapper.vc71.vcproj", "{BCAB273A-CEDE-440D-866D-21AAFEC60218}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Debug Unicode = Debug Unicode
- Debug Unicode NoInit = Debug Unicode NoInit
- Release = Release
- Release Profile Unicode = Release Profile Unicode
- Release Unicode = Release Unicode
- Release Unicode fast build = Release Unicode fast build
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Debug.ActiveCfg = Debug|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Debug.Build.0 = Debug|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Debug Unicode.ActiveCfg = Debug Unicode|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Debug Unicode.Build.0 = Debug Unicode|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Debug Unicode NoInit.ActiveCfg = Debug Unicode NoInit|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Debug Unicode NoInit.Build.0 = Debug Unicode NoInit|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release.ActiveCfg = Release|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release.Build.0 = Release|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.ActiveCfg = Release Profile Unicode|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.Build.0 = Release Profile Unicode|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.ActiveCfg = Release Unicode|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.Build.0 = Release Unicode|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.ActiveCfg = Release Unicode fast build|Win32
- {A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.Build.0 = Release Unicode fast build|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug.ActiveCfg = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug.Build.0 = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug Unicode.ActiveCfg = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug Unicode.Build.0 = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug Unicode NoInit.ActiveCfg = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Debug Unicode NoInit.Build.0 = Debug|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release.ActiveCfg = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release.Build.0 = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Profile Unicode.ActiveCfg = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Profile Unicode.Build.0 = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Unicode.ActiveCfg = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Unicode.Build.0 = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Unicode fast build.ActiveCfg = Release|Win32
- {BCAB273A-CEDE-440D-866D-21AAFEC60218}.Release Unicode fast build.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/src/mse.vc71.vcproj b/src/mse.vc71.vcproj
deleted file mode 100644
index 115f3549..00000000
--- a/src/mse.vc71.vcproj
+++ /dev/null
@@ -1,4103 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/mse.vcproj b/src/mse.vcproj
deleted file mode 100644
index ed2e259d..00000000
--- a/src/mse.vcproj
+++ /dev/null
@@ -1,4455 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc
deleted file mode 100644
index 9b499c01..00000000
--- a/src/resource/msw/mse.rc
+++ /dev/null
@@ -1,229 +0,0 @@
-//+----------------------------------------------------------------------------+
-//| Description: Magic Set Editor - Program to make Magic (tm) cards |
-//| Copyright: (C) 2001 - 2008 Twan van Laarhoven and "coppro" |
-//| License: GNU General Public License 2 or later (see file COPYING) |
-//+----------------------------------------------------------------------------+
-
-#include // include for version info constants
-
-// -------------------------------------------------------- : Icons
-
-icon/app ICON "icon/app.ico" // has to come first in alphabet!!
-icon/installer ICON "icon/installer.ico"
-icon/set ICON "icon/set.ico"
-icon/symbol ICON "icon/symbol.ico"
-
-// -------------------------------------------------------- : Toolbar
-
-cursor/rot_text CURSOR "cursor/rot_text.cur"
-
-tool/new IMAGE "tool/new.png"
-tool/open IMAGE "tool/open.png"
-tool/save IMAGE "tool/save.png"
-tool/export IMAGE "tool/export.png"
-tool/export_html IMAGE "tool/export_html.png"
-tool/export_image IMAGE "tool/export_image.png"
-tool/export_images IMAGE "tool/export_images.png"
-tool/export_mws IMAGE "tool/export_mws.png"
-tool/export_apprentice IMAGE "tool/export_apprentice.png"
-tool/print IMAGE "tool/print.png"
-tool/print_preview IMAGE "tool/print_preview.png"
-
-tool/undo IMAGE "tool/undo.png"
-tool/redo IMAGE "tool/redo.png"
-tool/cut IMAGE "tool/cut.png"
-tool/copy IMAGE "tool/copy.png"
-tool/paste IMAGE "tool/paste.png"
-tool/find IMAGE "tool/find.png"
-
-tool/bold IMAGE "tool/bold.png"
-tool/italic IMAGE "tool/italic.png"
-tool/symbol IMAGE "tool/symbol.png"
-tool/reminder IMAGE "tool/reminder.png"
-tool/no_auto IMAGE "tool/no_auto.png"
-
-tool/card_add IMAGE "tool/card_add.png"
-tool/card_add_multiple IMAGE "tool/card_add_multiple.png"
-tool/card_del IMAGE "tool/card_del.png"
-tool/card_rotate IMAGE "tool/card_rotate.png"
-tool/card_rotate_0 IMAGE "tool/card_rotate_0.png"
-tool/card_rotate_90 IMAGE "tool/card_rotate_90.png"
-tool/card_rotate_180 IMAGE "tool/card_rotate_180.png"
-tool/card_rotate_270 IMAGE "tool/card_rotate_270.png"
-
-tool/keyword_add IMAGE "tool/keyword_add.png"
-tool/keyword_del IMAGE "tool/keyword_del.png"
-
-tool/graph_pie IMAGE "tool/graph_pie.png"
-tool/graph_bar IMAGE "tool/graph_bar.png"
-tool/graph_stack IMAGE "tool/graph_stack.png"
-tool/graph_scatter IMAGE "tool/graph_scatter.png"
-tool/graph_scatter_pie IMAGE "tool/graph_scatter_pie.png"
-
-tool/window_cards IMAGE "tool/window_cards.png"
-tool/window_set_info IMAGE "tool/window_set_info.png"
-tool/window_style IMAGE "tool/window_style.png"
-tool/window_keywords IMAGE "tool/window_keywords.png"
-tool/window_statistics IMAGE "tool/window_statistics.png"
-tool/window_random_pack IMAGE "tool/window_random_pack.png"
-tool/window_console IMAGE "tool/window_console.png"
-
-tool/help IMAGE "tool/help.png"
-
-// -------------------------------------------------------- : Symbol editor
-
-cursor/point CURSOR "cursor/point.cur"
-cursor/point_add CURSOR "cursor/point_add.cur"
-cursor/point_move CURSOR "cursor/point_move.cur"
-cursor/curve CURSOR "cursor/curve.cur"
-cursor/rotate CURSOR "cursor/rotate.cur"
-cursor/shear_x CURSOR "cursor/shear_x.cur"
-cursor/shear_y CURSOR "cursor/shear_y.cur"
-
-tool/line IMAGE "tool/line.png"
-tool/curve IMAGE "tool/curve.png"
-tool/lock_free IMAGE "tool/lock_free.png"
-tool/lock_dir IMAGE "tool/lock_dir.png"
-tool/lock_size IMAGE "tool/lock_size.png"
-
-tool/circle IMAGE "tool/circle.png"
-tool/rectangle IMAGE "tool/rectangle.png"
-tool/triangle IMAGE "tool/triangle.png"
-tool/star IMAGE "tool/star.png"
-
-tool/mode_select IMAGE "tool/mode_select.png"
-tool/mode_rotate IMAGE "tool/mode_rotate.png"
-tool/mode_curve IMAGE "tool/mode_curve.png"
-tool/mode_paint IMAGE "tool/mode_paint.png"
-tool/mode_symmetry IMAGE "tool/mode_symmetry.png"
-tool/apply IMAGE "tool/apply.png"
-tool/duplicate IMAGE "tool/duplicate.png"
-tool/grid IMAGE "tool/grid.png"
-tool/grid_snap IMAGE "tool/grid_snap.png"
-tool/group IMAGE "tool/group.png"
-tool/ungroup IMAGE "tool/ungroup.png"
-
-tool/symmetry_add IMAGE "tool/symmetry_add.png"
-tool/symmetry_remove IMAGE "tool/symmetry_remove.png"
-
-combine_or IMAGE "../common/combine_or.png"
-combine_sub IMAGE "../common/combine_sub.png"
-combine_sub_dark IMAGE "../common/combine_sub_dark.png"
-combine_and IMAGE "../common/combine_and.png"
-combine_and_dark IMAGE "../common/combine_and_dark.png"
-combine_xor IMAGE "../common/combine_xor.png"
-combine_over IMAGE "../common/combine_over.png"
-combine_border IMAGE "../common/combine_border.png"
-symmetry_rotation IMAGE "../common/symmetry_rotation.png"
-symmetry_reflection IMAGE "../common/symmetry_reflection.png"
-symbol_group IMAGE "../common/symbol_group.png"
-
-icon_combine_merge IMAGE "../common/icon_combine_merge.png"
-icon_combine_subtract IMAGE "../common/icon_combine_subtract.png"
-icon_combine_intersection IMAGE "../common/icon_combine_intersection.png"
-icon_combine_difference IMAGE "../common/icon_combine_difference.png"
-icon_combine_overlap IMAGE "../common/icon_combine_overlap.png"
-icon_combine_border IMAGE "../common/icon_combine_border.png"
-icon_symmetry_rotation IMAGE "../common/icon_symmetry_rotation.png"
-icon_symmetry_reflection IMAGE "../common/icon_symmetry_reflection.png"
-icon_symbol_group IMAGE "../common/icon_symbol_group.png"
-
-handle_rotate IMAGE "../common/handle_rotate.png"
-handle_shear_x IMAGE "../common/handle_shear_x.png"
-handle_center IMAGE "../common/handle_center.png"
-
-// -------------------------------------------------------- : Other
-
-sort_asc IMAGE "other/sort_asc.png"
-sort_desc IMAGE "other/sort_desc.png"
-plus IMAGE "other/plus.png"
-minus IMAGE "other/minus.png"
-selected IMAGE "other/selected_yes.png"
-deselected IMAGE "other/selected_no.png"
-
-bool_yes IMAGE "../common/bool_yes.png"
-bool_no IMAGE "../common/bool_no.png"
-
-//help_book BITMAP "help_book.png"
-//help_book_open BITMAP "help_book_open.png"
-//help_page BITMAP "help_page.png"
-
-about IMAGE "../common/about.png"
-two_beta IMAGE "../common/two_beta.png"
-btn_normal IMAGE "../common/btn_normal.png"
-btn_hover IMAGE "../common/btn_hover.png"
-btn_focus IMAGE "../common/btn_focus.png"
-btn_down IMAGE "../common/btn_down.png"
-btn_ok_normal IMAGE "../common/btn_ok_normal.png"
-btn_ok_hover IMAGE "../common/btn_ok_hover.png"
-btn_ok_focus IMAGE "../common/btn_ok_focus.png"
-btn_ok_down IMAGE "../common/btn_ok_down.png"
-btn_collapse_normal IMAGE "../common/btn_collapse_normal.png"
-btn_collapse_hover IMAGE "../common/btn_collapse_hover.png"
-btn_collapse_focus IMAGE "../common/btn_collapse_focus.png"
-btn_collapse_down IMAGE "../common/btn_collapse_down.png"
-btn_expand_normal IMAGE "../common/btn_expand_normal.png"
-btn_expand_hover IMAGE "../common/btn_expand_hover.png"
-btn_expand_focus IMAGE "../common/btn_expand_focus.png"
-btn_expand_down IMAGE "../common/btn_expand_down.png"
-btn_clear_filter_normal IMAGE "../common/btn_clear_filter_normal.png"
-btn_clear_filter_hover IMAGE "../common/btn_clear_filter_hover.png"
-btn_clear_filter_focus IMAGE "../common/btn_clear_filter_focus.png"
-btn_clear_filter_down IMAGE "../common/btn_clear_filter_down.png"
-
-//about_xmas IMAGE "about-xmas.png"
-//two_xmas IMAGE "two_beta-xmas.png"
-
-welcome_new IMAGE "../common/welcome_new.png"
-welcome_open IMAGE "../common/welcome_open.png"
-welcome_last IMAGE "../common/welcome_last.png"
-welcome_updates IMAGE "../common/welcome_updates.png"
-
-edit_symbol IMAGE "../common/edit_symbol.png"
-
-installer_group IMAGE "../common/installer_group.png"
-installer_package IMAGE "../common/installer_package.png"
-installer_locales IMAGE "../common/installer_locales.png"
-installer_program IMAGE "../common/installer_program.png"
-//installer_font IMAGE "../common/installer_font.png"
-
-message_input IMAGE "../common/message_input.png"
-message_information IMAGE "../common/message_information.png"
-message_warning IMAGE "../common/message_warning.png"
-message_error IMAGE "../common/message_error.png"
-
-// -------------------------------------------------------- : WX
-
-wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
-WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur"
-
-// -------------------------------------------------------- : Other
-
-expected_locale_keys TEXT "../common/expected_locale_keys"
-
-// -------------------------------------------------------- : Version info
-
-1 VERSIONINFO
-FILEVERSION 2,0,0,0
-PRODUCTVERSION 2,0,0,0
-FILETYPE VFT_APP
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- VALUE "FileVersion", "2.0.0"
- VALUE "License", "GNU General Public License 2 or later; This is free software, and you are welcome to redistribute it under certain conditions; See the help file for details"
- VALUE "FileDescription", "Magic Set Editor"
- VALUE "InternalName", "magicseteditor"
- VALUE "LegalCopyright", "\xA9 2001-2011 Twan van Laarhoven and 'coppro'"
- VALUE "ProductName", "Magic Set Editor"
- }
- }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER < 1400
-#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
-//1 24 "wx/msw/wx.manifest"
-#endif
-#endif
diff --git a/src/win32-cli-wrapper.vc71.vcproj b/src/win32-cli-wrapper.vc71.vcproj
deleted file mode 100644
index 5ae3ad98..00000000
--- a/src/win32-cli-wrapper.vc71.vcproj
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-