diff --git a/core/Makefile.am b/aegisub/Makefile.am similarity index 100% rename from core/Makefile.am rename to aegisub/Makefile.am diff --git a/core/MatroskaParser.c b/aegisub/MatroskaParser.c similarity index 100% rename from core/MatroskaParser.c rename to aegisub/MatroskaParser.c diff --git a/core/MatroskaParser.h b/aegisub/MatroskaParser.h similarity index 100% rename from core/MatroskaParser.h rename to aegisub/MatroskaParser.h diff --git a/core/VideoSink.h b/aegisub/VideoSink.h similarity index 100% rename from core/VideoSink.h rename to aegisub/VideoSink.h diff --git a/core/aegisublocale.cpp b/aegisub/aegisublocale.cpp similarity index 100% rename from core/aegisublocale.cpp rename to aegisub/aegisublocale.cpp diff --git a/core/aegisublocale.h b/aegisub/aegisublocale.h similarity index 100% rename from core/aegisublocale.h rename to aegisub/aegisublocale.h diff --git a/core/ass_attachment.cpp b/aegisub/ass_attachment.cpp similarity index 100% rename from core/ass_attachment.cpp rename to aegisub/ass_attachment.cpp diff --git a/core/ass_attachment.h b/aegisub/ass_attachment.h similarity index 100% rename from core/ass_attachment.h rename to aegisub/ass_attachment.h diff --git a/core/ass_dialogue.cpp b/aegisub/ass_dialogue.cpp similarity index 100% rename from core/ass_dialogue.cpp rename to aegisub/ass_dialogue.cpp diff --git a/core/ass_dialogue.h b/aegisub/ass_dialogue.h similarity index 100% rename from core/ass_dialogue.h rename to aegisub/ass_dialogue.h diff --git a/core/ass_entry.cpp b/aegisub/ass_entry.cpp similarity index 100% rename from core/ass_entry.cpp rename to aegisub/ass_entry.cpp diff --git a/core/ass_entry.h b/aegisub/ass_entry.h similarity index 100% rename from core/ass_entry.h rename to aegisub/ass_entry.h diff --git a/core/ass_export_filter.cpp b/aegisub/ass_export_filter.cpp similarity index 100% rename from core/ass_export_filter.cpp rename to aegisub/ass_export_filter.cpp diff --git a/core/ass_export_filter.h b/aegisub/ass_export_filter.h similarity index 100% rename from core/ass_export_filter.h rename to aegisub/ass_export_filter.h diff --git a/core/ass_exporter.cpp b/aegisub/ass_exporter.cpp similarity index 100% rename from core/ass_exporter.cpp rename to aegisub/ass_exporter.cpp diff --git a/core/ass_exporter.h b/aegisub/ass_exporter.h similarity index 100% rename from core/ass_exporter.h rename to aegisub/ass_exporter.h diff --git a/core/ass_file.cpp b/aegisub/ass_file.cpp similarity index 100% rename from core/ass_file.cpp rename to aegisub/ass_file.cpp diff --git a/core/ass_file.h b/aegisub/ass_file.h similarity index 100% rename from core/ass_file.h rename to aegisub/ass_file.h diff --git a/core/ass_override.cpp b/aegisub/ass_override.cpp similarity index 100% rename from core/ass_override.cpp rename to aegisub/ass_override.cpp diff --git a/core/ass_override.h b/aegisub/ass_override.h similarity index 100% rename from core/ass_override.h rename to aegisub/ass_override.h diff --git a/core/ass_style.cpp b/aegisub/ass_style.cpp similarity index 100% rename from core/ass_style.cpp rename to aegisub/ass_style.cpp diff --git a/core/ass_style.h b/aegisub/ass_style.h similarity index 100% rename from core/ass_style.h rename to aegisub/ass_style.h diff --git a/core/ass_style_storage.cpp b/aegisub/ass_style_storage.cpp similarity index 100% rename from core/ass_style_storage.cpp rename to aegisub/ass_style_storage.cpp diff --git a/core/ass_style_storage.h b/aegisub/ass_style_storage.h similarity index 100% rename from core/ass_style_storage.h rename to aegisub/ass_style_storage.h diff --git a/core/ass_time.cpp b/aegisub/ass_time.cpp similarity index 100% rename from core/ass_time.cpp rename to aegisub/ass_time.cpp diff --git a/core/ass_time.h b/aegisub/ass_time.h similarity index 100% rename from core/ass_time.h rename to aegisub/ass_time.h diff --git a/core/audio_box.cpp b/aegisub/audio_box.cpp similarity index 100% rename from core/audio_box.cpp rename to aegisub/audio_box.cpp diff --git a/core/audio_box.h b/aegisub/audio_box.h similarity index 100% rename from core/audio_box.h rename to aegisub/audio_box.h diff --git a/core/audio_display.cpp b/aegisub/audio_display.cpp similarity index 100% rename from core/audio_display.cpp rename to aegisub/audio_display.cpp diff --git a/core/audio_display.h b/aegisub/audio_display.h similarity index 100% rename from core/audio_display.h rename to aegisub/audio_display.h diff --git a/core/audio_karaoke.cpp b/aegisub/audio_karaoke.cpp similarity index 100% rename from core/audio_karaoke.cpp rename to aegisub/audio_karaoke.cpp diff --git a/core/audio_karaoke.h b/aegisub/audio_karaoke.h similarity index 100% rename from core/audio_karaoke.h rename to aegisub/audio_karaoke.h diff --git a/core/audio_player.cpp b/aegisub/audio_player.cpp similarity index 100% rename from core/audio_player.cpp rename to aegisub/audio_player.cpp diff --git a/core/audio_player.h b/aegisub/audio_player.h similarity index 100% rename from core/audio_player.h rename to aegisub/audio_player.h diff --git a/core/audio_player_dsound.cpp b/aegisub/audio_player_dsound.cpp similarity index 100% rename from core/audio_player_dsound.cpp rename to aegisub/audio_player_dsound.cpp diff --git a/core/audio_player_dsound.h b/aegisub/audio_player_dsound.h similarity index 100% rename from core/audio_player_dsound.h rename to aegisub/audio_player_dsound.h diff --git a/core/audio_player_portaudio.cpp b/aegisub/audio_player_portaudio.cpp similarity index 100% rename from core/audio_player_portaudio.cpp rename to aegisub/audio_player_portaudio.cpp diff --git a/core/audio_player_portaudio.h b/aegisub/audio_player_portaudio.h similarity index 100% rename from core/audio_player_portaudio.h rename to aegisub/audio_player_portaudio.h diff --git a/core/audio_provider.cpp b/aegisub/audio_provider.cpp similarity index 100% rename from core/audio_provider.cpp rename to aegisub/audio_provider.cpp diff --git a/core/audio_provider.h b/aegisub/audio_provider.h similarity index 100% rename from core/audio_provider.h rename to aegisub/audio_provider.h diff --git a/core/audio_provider_avs.cpp b/aegisub/audio_provider_avs.cpp similarity index 100% rename from core/audio_provider_avs.cpp rename to aegisub/audio_provider_avs.cpp diff --git a/core/audio_provider_avs.h b/aegisub/audio_provider_avs.h similarity index 100% rename from core/audio_provider_avs.h rename to aegisub/audio_provider_avs.h diff --git a/core/audio_provider_hd.cpp b/aegisub/audio_provider_hd.cpp similarity index 100% rename from core/audio_provider_hd.cpp rename to aegisub/audio_provider_hd.cpp diff --git a/core/audio_provider_hd.h b/aegisub/audio_provider_hd.h similarity index 100% rename from core/audio_provider_hd.h rename to aegisub/audio_provider_hd.h diff --git a/core/audio_provider_lavc.cpp b/aegisub/audio_provider_lavc.cpp similarity index 100% rename from core/audio_provider_lavc.cpp rename to aegisub/audio_provider_lavc.cpp diff --git a/core/audio_provider_lavc.h b/aegisub/audio_provider_lavc.h similarity index 100% rename from core/audio_provider_lavc.h rename to aegisub/audio_provider_lavc.h diff --git a/core/audio_provider_ram.cpp b/aegisub/audio_provider_ram.cpp similarity index 100% rename from core/audio_provider_ram.cpp rename to aegisub/audio_provider_ram.cpp diff --git a/core/audio_provider_ram.h b/aegisub/audio_provider_ram.h similarity index 100% rename from core/audio_provider_ram.h rename to aegisub/audio_provider_ram.h diff --git a/core/audio_provider_stream.cpp b/aegisub/audio_provider_stream.cpp similarity index 100% rename from core/audio_provider_stream.cpp rename to aegisub/audio_provider_stream.cpp diff --git a/core/audio_provider_stream.h b/aegisub/audio_provider_stream.h similarity index 100% rename from core/audio_provider_stream.h rename to aegisub/audio_provider_stream.h diff --git a/core/auto3/automation.cpp b/aegisub/auto3/automation.cpp similarity index 100% rename from core/auto3/automation.cpp rename to aegisub/auto3/automation.cpp diff --git a/core/auto3/automation.h b/aegisub/auto3/automation.h similarity index 100% rename from core/auto3/automation.h rename to aegisub/auto3/automation.h diff --git a/core/auto3/automation_filter.cpp b/aegisub/auto3/automation_filter.cpp similarity index 100% rename from core/auto3/automation_filter.cpp rename to aegisub/auto3/automation_filter.cpp diff --git a/core/auto3/automation_filter.h b/aegisub/auto3/automation_filter.h similarity index 100% rename from core/auto3/automation_filter.h rename to aegisub/auto3/automation_filter.h diff --git a/core/auto3/automation_gui.cpp b/aegisub/auto3/automation_gui.cpp similarity index 100% rename from core/auto3/automation_gui.cpp rename to aegisub/auto3/automation_gui.cpp diff --git a/core/auto3/automation_gui.h b/aegisub/auto3/automation_gui.h similarity index 100% rename from core/auto3/automation_gui.h rename to aegisub/auto3/automation_gui.h diff --git a/core/auto4-status.txt b/aegisub/auto4-status.txt similarity index 100% rename from core/auto4-status.txt rename to aegisub/auto4-status.txt diff --git a/core/auto4_base.cpp b/aegisub/auto4_base.cpp similarity index 100% rename from core/auto4_base.cpp rename to aegisub/auto4_base.cpp diff --git a/core/auto4_base.h b/aegisub/auto4_base.h similarity index 100% rename from core/auto4_base.h rename to aegisub/auto4_base.h diff --git a/core/auto4_lua.cpp b/aegisub/auto4_lua.cpp similarity index 100% rename from core/auto4_lua.cpp rename to aegisub/auto4_lua.cpp diff --git a/core/auto4_lua.h b/aegisub/auto4_lua.h similarity index 100% rename from core/auto4_lua.h rename to aegisub/auto4_lua.h diff --git a/core/auto4_lua_assfile.cpp b/aegisub/auto4_lua_assfile.cpp similarity index 100% rename from core/auto4_lua_assfile.cpp rename to aegisub/auto4_lua_assfile.cpp diff --git a/core/auto4_lua_dialog.cpp b/aegisub/auto4_lua_dialog.cpp similarity index 100% rename from core/auto4_lua_dialog.cpp rename to aegisub/auto4_lua_dialog.cpp diff --git a/core/avisynth.h b/aegisub/avisynth.h similarity index 100% rename from core/avisynth.h rename to aegisub/avisynth.h diff --git a/core/avisynth_wrap.cpp b/aegisub/avisynth_wrap.cpp similarity index 100% rename from core/avisynth_wrap.cpp rename to aegisub/avisynth_wrap.cpp diff --git a/core/avisynth_wrap.h b/aegisub/avisynth_wrap.h similarity index 100% rename from core/avisynth_wrap.h rename to aegisub/avisynth_wrap.h diff --git a/core/base_grid.cpp b/aegisub/base_grid.cpp similarity index 100% rename from core/base_grid.cpp rename to aegisub/base_grid.cpp diff --git a/core/base_grid.h b/aegisub/base_grid.h similarity index 100% rename from core/base_grid.h rename to aegisub/base_grid.h diff --git a/core/bitmaps/Makefile.am b/aegisub/bitmaps/Makefile.am similarity index 100% rename from core/bitmaps/Makefile.am rename to aegisub/bitmaps/Makefile.am diff --git a/core/bitmaps/about.bmp b/aegisub/bitmaps/about.bmp similarity index 100% rename from core/bitmaps/about.bmp rename to aegisub/bitmaps/about.bmp diff --git a/core/bitmaps/arrow_down.bmp b/aegisub/bitmaps/arrow_down.bmp similarity index 100% rename from core/bitmaps/arrow_down.bmp rename to aegisub/bitmaps/arrow_down.bmp diff --git a/core/bitmaps/arrow_up.bmp b/aegisub/bitmaps/arrow_up.bmp similarity index 100% rename from core/bitmaps/arrow_up.bmp rename to aegisub/bitmaps/arrow_up.bmp diff --git a/core/bitmaps/attach.bmp b/aegisub/bitmaps/attach.bmp similarity index 100% rename from core/bitmaps/attach.bmp rename to aegisub/bitmaps/attach.bmp diff --git a/core/bitmaps/automation.bmp b/aegisub/bitmaps/automation.bmp similarity index 100% rename from core/bitmaps/automation.bmp rename to aegisub/bitmaps/automation.bmp diff --git a/core/bitmaps/blank.bmp b/aegisub/bitmaps/blank.bmp similarity index 100% rename from core/bitmaps/blank.bmp rename to aegisub/bitmaps/blank.bmp diff --git a/core/bitmaps/bugtracker.bmp b/aegisub/bitmaps/bugtracker.bmp similarity index 100% rename from core/bitmaps/bugtracker.bmp rename to aegisub/bitmaps/bugtracker.bmp diff --git a/core/bitmaps/button_audio_commit.bmp b/aegisub/bitmaps/button_audio_commit.bmp similarity index 100% rename from core/bitmaps/button_audio_commit.bmp rename to aegisub/bitmaps/button_audio_commit.bmp diff --git a/core/bitmaps/button_audio_go.bmp b/aegisub/bitmaps/button_audio_go.bmp similarity index 100% rename from core/bitmaps/button_audio_go.bmp rename to aegisub/bitmaps/button_audio_go.bmp diff --git a/core/bitmaps/button_bold.bmp b/aegisub/bitmaps/button_bold.bmp similarity index 100% rename from core/bitmaps/button_bold.bmp rename to aegisub/bitmaps/button_bold.bmp diff --git a/core/bitmaps/button_color1.bmp b/aegisub/bitmaps/button_color1.bmp similarity index 100% rename from core/bitmaps/button_color1.bmp rename to aegisub/bitmaps/button_color1.bmp diff --git a/core/bitmaps/button_color2.bmp b/aegisub/bitmaps/button_color2.bmp similarity index 100% rename from core/bitmaps/button_color2.bmp rename to aegisub/bitmaps/button_color2.bmp diff --git a/core/bitmaps/button_color3.bmp b/aegisub/bitmaps/button_color3.bmp similarity index 100% rename from core/bitmaps/button_color3.bmp rename to aegisub/bitmaps/button_color3.bmp diff --git a/core/bitmaps/button_color4.bmp b/aegisub/bitmaps/button_color4.bmp similarity index 100% rename from core/bitmaps/button_color4.bmp rename to aegisub/bitmaps/button_color4.bmp diff --git a/core/bitmaps/button_fontname.bmp b/aegisub/bitmaps/button_fontname.bmp similarity index 100% rename from core/bitmaps/button_fontname.bmp rename to aegisub/bitmaps/button_fontname.bmp diff --git a/core/bitmaps/button_italics.bmp b/aegisub/bitmaps/button_italics.bmp similarity index 100% rename from core/bitmaps/button_italics.bmp rename to aegisub/bitmaps/button_italics.bmp diff --git a/core/bitmaps/button_leadin.bmp b/aegisub/bitmaps/button_leadin.bmp similarity index 100% rename from core/bitmaps/button_leadin.bmp rename to aegisub/bitmaps/button_leadin.bmp diff --git a/core/bitmaps/button_leadout.bmp b/aegisub/bitmaps/button_leadout.bmp similarity index 100% rename from core/bitmaps/button_leadout.bmp rename to aegisub/bitmaps/button_leadout.bmp diff --git a/core/bitmaps/button_next.bmp b/aegisub/bitmaps/button_next.bmp similarity index 100% rename from core/bitmaps/button_next.bmp rename to aegisub/bitmaps/button_next.bmp diff --git a/core/bitmaps/button_play.bmp b/aegisub/bitmaps/button_play.bmp similarity index 100% rename from core/bitmaps/button_play.bmp rename to aegisub/bitmaps/button_play.bmp diff --git a/core/bitmaps/button_play500after.bmp b/aegisub/bitmaps/button_play500after.bmp similarity index 100% rename from core/bitmaps/button_play500after.bmp rename to aegisub/bitmaps/button_play500after.bmp diff --git a/core/bitmaps/button_play500before.bmp b/aegisub/bitmaps/button_play500before.bmp similarity index 100% rename from core/bitmaps/button_play500before.bmp rename to aegisub/bitmaps/button_play500before.bmp diff --git a/core/bitmaps/button_playfirst500.bmp b/aegisub/bitmaps/button_playfirst500.bmp similarity index 100% rename from core/bitmaps/button_playfirst500.bmp rename to aegisub/bitmaps/button_playfirst500.bmp diff --git a/core/bitmaps/button_playlast500.bmp b/aegisub/bitmaps/button_playlast500.bmp similarity index 100% rename from core/bitmaps/button_playlast500.bmp rename to aegisub/bitmaps/button_playlast500.bmp diff --git a/core/bitmaps/button_playline.bmp b/aegisub/bitmaps/button_playline.bmp similarity index 100% rename from core/bitmaps/button_playline.bmp rename to aegisub/bitmaps/button_playline.bmp diff --git a/core/bitmaps/button_playsel.bmp b/aegisub/bitmaps/button_playsel.bmp similarity index 100% rename from core/bitmaps/button_playsel.bmp rename to aegisub/bitmaps/button_playsel.bmp diff --git a/core/bitmaps/button_playtoend.bmp b/aegisub/bitmaps/button_playtoend.bmp similarity index 100% rename from core/bitmaps/button_playtoend.bmp rename to aegisub/bitmaps/button_playtoend.bmp diff --git a/core/bitmaps/button_prev.bmp b/aegisub/bitmaps/button_prev.bmp similarity index 100% rename from core/bitmaps/button_prev.bmp rename to aegisub/bitmaps/button_prev.bmp diff --git a/core/bitmaps/button_stop.bmp b/aegisub/bitmaps/button_stop.bmp similarity index 100% rename from core/bitmaps/button_stop.bmp rename to aegisub/bitmaps/button_stop.bmp diff --git a/core/bitmaps/button_strikeout.bmp b/aegisub/bitmaps/button_strikeout.bmp similarity index 100% rename from core/bitmaps/button_strikeout.bmp rename to aegisub/bitmaps/button_strikeout.bmp diff --git a/core/bitmaps/button_track_move.bmp b/aegisub/bitmaps/button_track_move.bmp similarity index 100% rename from core/bitmaps/button_track_move.bmp rename to aegisub/bitmaps/button_track_move.bmp diff --git a/core/bitmaps/button_track_movement.bmp b/aegisub/bitmaps/button_track_movement.bmp similarity index 100% rename from core/bitmaps/button_track_movement.bmp rename to aegisub/bitmaps/button_track_movement.bmp diff --git a/core/bitmaps/button_track_point_add.bmp b/aegisub/bitmaps/button_track_point_add.bmp similarity index 100% rename from core/bitmaps/button_track_point_add.bmp rename to aegisub/bitmaps/button_track_point_add.bmp diff --git a/core/bitmaps/button_track_point_del.bmp b/aegisub/bitmaps/button_track_point_del.bmp similarity index 100% rename from core/bitmaps/button_track_point_del.bmp rename to aegisub/bitmaps/button_track_point_del.bmp diff --git a/core/bitmaps/button_track_points.bmp b/aegisub/bitmaps/button_track_points.bmp similarity index 100% rename from core/bitmaps/button_track_points.bmp rename to aegisub/bitmaps/button_track_points.bmp diff --git a/core/bitmaps/button_track_split_line.bmp b/aegisub/bitmaps/button_track_split_line.bmp similarity index 100% rename from core/bitmaps/button_track_split_line.bmp rename to aegisub/bitmaps/button_track_split_line.bmp diff --git a/core/bitmaps/button_track_trail.bmp b/aegisub/bitmaps/button_track_trail.bmp similarity index 100% rename from core/bitmaps/button_track_trail.bmp rename to aegisub/bitmaps/button_track_trail.bmp diff --git a/core/bitmaps/button_underline.bmp b/aegisub/bitmaps/button_underline.bmp similarity index 100% rename from core/bitmaps/button_underline.bmp rename to aegisub/bitmaps/button_underline.bmp diff --git a/core/bitmaps/contents.bmp b/aegisub/bitmaps/contents.bmp similarity index 100% rename from core/bitmaps/contents.bmp rename to aegisub/bitmaps/contents.bmp diff --git a/core/bitmaps/copy.bmp b/aegisub/bitmaps/copy.bmp similarity index 100% rename from core/bitmaps/copy.bmp rename to aegisub/bitmaps/copy.bmp diff --git a/core/bitmaps/copy_disable.bmp b/aegisub/bitmaps/copy_disable.bmp similarity index 100% rename from core/bitmaps/copy_disable.bmp rename to aegisub/bitmaps/copy_disable.bmp diff --git a/core/bitmaps/cut.bmp b/aegisub/bitmaps/cut.bmp similarity index 100% rename from core/bitmaps/cut.bmp rename to aegisub/bitmaps/cut.bmp diff --git a/core/bitmaps/cut_disable.bmp b/aegisub/bitmaps/cut_disable.bmp similarity index 100% rename from core/bitmaps/cut_disable.bmp rename to aegisub/bitmaps/cut_disable.bmp diff --git a/core/bitmaps/delete.bmp b/aegisub/bitmaps/delete.bmp similarity index 100% rename from core/bitmaps/delete.bmp rename to aegisub/bitmaps/delete.bmp diff --git a/core/bitmaps/delete_disable.bmp b/aegisub/bitmaps/delete_disable.bmp similarity index 100% rename from core/bitmaps/delete_disable.bmp rename to aegisub/bitmaps/delete_disable.bmp diff --git a/core/bitmaps/exit.bmp b/aegisub/bitmaps/exit.bmp similarity index 100% rename from core/bitmaps/exit.bmp rename to aegisub/bitmaps/exit.bmp diff --git a/core/bitmaps/find.bmp b/aegisub/bitmaps/find.bmp similarity index 100% rename from core/bitmaps/find.bmp rename to aegisub/bitmaps/find.bmp diff --git a/core/bitmaps/find_next.bmp b/aegisub/bitmaps/find_next.bmp similarity index 100% rename from core/bitmaps/find_next.bmp rename to aegisub/bitmaps/find_next.bmp diff --git a/core/bitmaps/fontcollect.bmp b/aegisub/bitmaps/fontcollect.bmp similarity index 100% rename from core/bitmaps/fontcollect.bmp rename to aegisub/bitmaps/fontcollect.bmp diff --git a/core/bitmaps/forums.bmp b/aegisub/bitmaps/forums.bmp similarity index 100% rename from core/bitmaps/forums.bmp rename to aegisub/bitmaps/forums.bmp diff --git a/core/bitmaps/genxpm.sh b/aegisub/bitmaps/genxpm.sh similarity index 100% rename from core/bitmaps/genxpm.sh rename to aegisub/bitmaps/genxpm.sh diff --git a/core/bitmaps/hotkeys.bmp b/aegisub/bitmaps/hotkeys.bmp similarity index 100% rename from core/bitmaps/hotkeys.bmp rename to aegisub/bitmaps/hotkeys.bmp diff --git a/core/bitmaps/icon.ico b/aegisub/bitmaps/icon.ico similarity index 100% rename from core/bitmaps/icon.ico rename to aegisub/bitmaps/icon.ico diff --git a/core/bitmaps/irc.bmp b/aegisub/bitmaps/irc.bmp similarity index 100% rename from core/bitmaps/irc.bmp rename to aegisub/bitmaps/irc.bmp diff --git a/core/bitmaps/jumpto.bmp b/aegisub/bitmaps/jumpto.bmp similarity index 100% rename from core/bitmaps/jumpto.bmp rename to aegisub/bitmaps/jumpto.bmp diff --git a/core/bitmaps/jumpto_disable.bmp b/aegisub/bitmaps/jumpto_disable.bmp similarity index 100% rename from core/bitmaps/jumpto_disable.bmp rename to aegisub/bitmaps/jumpto_disable.bmp diff --git a/core/bitmaps/new.bmp b/aegisub/bitmaps/new.bmp similarity index 100% rename from core/bitmaps/new.bmp rename to aegisub/bitmaps/new.bmp diff --git a/core/bitmaps/null_button.bmp b/aegisub/bitmaps/null_button.bmp similarity index 100% rename from core/bitmaps/null_button.bmp rename to aegisub/bitmaps/null_button.bmp diff --git a/core/bitmaps/open.bmp b/aegisub/bitmaps/open.bmp similarity index 100% rename from core/bitmaps/open.bmp rename to aegisub/bitmaps/open.bmp diff --git a/core/bitmaps/open_with.bmp b/aegisub/bitmaps/open_with.bmp similarity index 100% rename from core/bitmaps/open_with.bmp rename to aegisub/bitmaps/open_with.bmp diff --git a/core/bitmaps/options.bmp b/aegisub/bitmaps/options.bmp similarity index 100% rename from core/bitmaps/options.bmp rename to aegisub/bitmaps/options.bmp diff --git a/core/bitmaps/paste.bmp b/aegisub/bitmaps/paste.bmp similarity index 100% rename from core/bitmaps/paste.bmp rename to aegisub/bitmaps/paste.bmp diff --git a/core/bitmaps/paste_disable.bmp b/aegisub/bitmaps/paste_disable.bmp similarity index 100% rename from core/bitmaps/paste_disable.bmp rename to aegisub/bitmaps/paste_disable.bmp diff --git a/core/bitmaps/paste_over.bmp b/aegisub/bitmaps/paste_over.bmp similarity index 100% rename from core/bitmaps/paste_over.bmp rename to aegisub/bitmaps/paste_over.bmp diff --git a/core/bitmaps/properties.bmp b/aegisub/bitmaps/properties.bmp similarity index 100% rename from core/bitmaps/properties.bmp rename to aegisub/bitmaps/properties.bmp diff --git a/core/bitmaps/redo.bmp b/aegisub/bitmaps/redo.bmp similarity index 100% rename from core/bitmaps/redo.bmp rename to aegisub/bitmaps/redo.bmp diff --git a/core/bitmaps/redo_disable.bmp b/aegisub/bitmaps/redo_disable.bmp similarity index 100% rename from core/bitmaps/redo_disable.bmp rename to aegisub/bitmaps/redo_disable.bmp diff --git a/core/bitmaps/replace.bmp b/aegisub/bitmaps/replace.bmp similarity index 100% rename from core/bitmaps/replace.bmp rename to aegisub/bitmaps/replace.bmp diff --git a/core/bitmaps/resample.bmp b/aegisub/bitmaps/resample.bmp similarity index 100% rename from core/bitmaps/resample.bmp rename to aegisub/bitmaps/resample.bmp diff --git a/core/bitmaps/save.bmp b/aegisub/bitmaps/save.bmp similarity index 100% rename from core/bitmaps/save.bmp rename to aegisub/bitmaps/save.bmp diff --git a/core/bitmaps/save_as.bmp b/aegisub/bitmaps/save_as.bmp similarity index 100% rename from core/bitmaps/save_as.bmp rename to aegisub/bitmaps/save_as.bmp diff --git a/core/bitmaps/select_visible.bmp b/aegisub/bitmaps/select_visible.bmp similarity index 100% rename from core/bitmaps/select_visible.bmp rename to aegisub/bitmaps/select_visible.bmp diff --git a/core/bitmaps/shift_times.bmp b/aegisub/bitmaps/shift_times.bmp similarity index 100% rename from core/bitmaps/shift_times.bmp rename to aegisub/bitmaps/shift_times.bmp diff --git a/core/bitmaps/shift_to_frame.bmp b/aegisub/bitmaps/shift_to_frame.bmp similarity index 100% rename from core/bitmaps/shift_to_frame.bmp rename to aegisub/bitmaps/shift_to_frame.bmp diff --git a/core/bitmaps/shift_to_frame_disable.bmp b/aegisub/bitmaps/shift_to_frame_disable.bmp similarity index 100% rename from core/bitmaps/shift_to_frame_disable.bmp rename to aegisub/bitmaps/shift_to_frame_disable.bmp diff --git a/core/bitmaps/snap_to_scene.bmp b/aegisub/bitmaps/snap_to_scene.bmp similarity index 100% rename from core/bitmaps/snap_to_scene.bmp rename to aegisub/bitmaps/snap_to_scene.bmp diff --git a/core/bitmaps/snap_to_scene_disable.bmp b/aegisub/bitmaps/snap_to_scene_disable.bmp similarity index 100% rename from core/bitmaps/snap_to_scene_disable.bmp rename to aegisub/bitmaps/snap_to_scene_disable.bmp diff --git a/core/bitmaps/sort_times.bmp b/aegisub/bitmaps/sort_times.bmp similarity index 100% rename from core/bitmaps/sort_times.bmp rename to aegisub/bitmaps/sort_times.bmp diff --git a/core/bitmaps/spellcheck.bmp b/aegisub/bitmaps/spellcheck.bmp similarity index 100% rename from core/bitmaps/spellcheck.bmp rename to aegisub/bitmaps/spellcheck.bmp diff --git a/core/bitmaps/splash.bmp b/aegisub/bitmaps/splash.bmp similarity index 100% rename from core/bitmaps/splash.bmp rename to aegisub/bitmaps/splash.bmp diff --git a/core/bitmaps/style_manager.bmp b/aegisub/bitmaps/style_manager.bmp similarity index 100% rename from core/bitmaps/style_manager.bmp rename to aegisub/bitmaps/style_manager.bmp diff --git a/core/bitmaps/styling_assistant.bmp b/aegisub/bitmaps/styling_assistant.bmp similarity index 100% rename from core/bitmaps/styling_assistant.bmp rename to aegisub/bitmaps/styling_assistant.bmp diff --git a/core/bitmaps/subend_to_video.bmp b/aegisub/bitmaps/subend_to_video.bmp similarity index 100% rename from core/bitmaps/subend_to_video.bmp rename to aegisub/bitmaps/subend_to_video.bmp diff --git a/core/bitmaps/subend_to_video_disable.bmp b/aegisub/bitmaps/subend_to_video_disable.bmp similarity index 100% rename from core/bitmaps/subend_to_video_disable.bmp rename to aegisub/bitmaps/subend_to_video_disable.bmp diff --git a/core/bitmaps/substart_to_video.bmp b/aegisub/bitmaps/substart_to_video.bmp similarity index 100% rename from core/bitmaps/substart_to_video.bmp rename to aegisub/bitmaps/substart_to_video.bmp diff --git a/core/bitmaps/substart_to_video_disable.bmp b/aegisub/bitmaps/substart_to_video_disable.bmp similarity index 100% rename from core/bitmaps/substart_to_video_disable.bmp rename to aegisub/bitmaps/substart_to_video_disable.bmp diff --git a/core/bitmaps/timing_processor.bmp b/aegisub/bitmaps/timing_processor.bmp similarity index 100% rename from core/bitmaps/timing_processor.bmp rename to aegisub/bitmaps/timing_processor.bmp diff --git a/core/bitmaps/toggle_audio_autocommit.bmp b/aegisub/bitmaps/toggle_audio_autocommit.bmp similarity index 100% rename from core/bitmaps/toggle_audio_autocommit.bmp rename to aegisub/bitmaps/toggle_audio_autocommit.bmp diff --git a/core/bitmaps/toggle_audio_autoscroll.bmp b/aegisub/bitmaps/toggle_audio_autoscroll.bmp similarity index 100% rename from core/bitmaps/toggle_audio_autoscroll.bmp rename to aegisub/bitmaps/toggle_audio_autoscroll.bmp diff --git a/core/bitmaps/toggle_audio_link.bmp b/aegisub/bitmaps/toggle_audio_link.bmp similarity index 100% rename from core/bitmaps/toggle_audio_link.bmp rename to aegisub/bitmaps/toggle_audio_link.bmp diff --git a/core/bitmaps/toggle_audio_spectrum.bmp b/aegisub/bitmaps/toggle_audio_spectrum.bmp similarity index 100% rename from core/bitmaps/toggle_audio_spectrum.bmp rename to aegisub/bitmaps/toggle_audio_spectrum.bmp diff --git a/core/bitmaps/toggle_audio_ssa.bmp b/aegisub/bitmaps/toggle_audio_ssa.bmp similarity index 100% rename from core/bitmaps/toggle_audio_ssa.bmp rename to aegisub/bitmaps/toggle_audio_ssa.bmp diff --git a/core/bitmaps/toggle_tag_hiding.bmp b/aegisub/bitmaps/toggle_tag_hiding.bmp similarity index 100% rename from core/bitmaps/toggle_tag_hiding.bmp rename to aegisub/bitmaps/toggle_tag_hiding.bmp diff --git a/core/bitmaps/toggle_video_autoscroll.bmp b/aegisub/bitmaps/toggle_video_autoscroll.bmp similarity index 100% rename from core/bitmaps/toggle_video_autoscroll.bmp rename to aegisub/bitmaps/toggle_video_autoscroll.bmp diff --git a/core/bitmaps/translation.bmp b/aegisub/bitmaps/translation.bmp similarity index 100% rename from core/bitmaps/translation.bmp rename to aegisub/bitmaps/translation.bmp diff --git a/core/bitmaps/undo.bmp b/aegisub/bitmaps/undo.bmp similarity index 100% rename from core/bitmaps/undo.bmp rename to aegisub/bitmaps/undo.bmp diff --git a/core/bitmaps/undo_disable.bmp b/aegisub/bitmaps/undo_disable.bmp similarity index 100% rename from core/bitmaps/undo_disable.bmp rename to aegisub/bitmaps/undo_disable.bmp diff --git a/core/bitmaps/video_to_subend.bmp b/aegisub/bitmaps/video_to_subend.bmp similarity index 100% rename from core/bitmaps/video_to_subend.bmp rename to aegisub/bitmaps/video_to_subend.bmp diff --git a/core/bitmaps/video_to_subend_disable.bmp b/aegisub/bitmaps/video_to_subend_disable.bmp similarity index 100% rename from core/bitmaps/video_to_subend_disable.bmp rename to aegisub/bitmaps/video_to_subend_disable.bmp diff --git a/core/bitmaps/video_to_substart.bmp b/aegisub/bitmaps/video_to_substart.bmp similarity index 100% rename from core/bitmaps/video_to_substart.bmp rename to aegisub/bitmaps/video_to_substart.bmp diff --git a/core/bitmaps/video_to_substart_disable.bmp b/aegisub/bitmaps/video_to_substart_disable.bmp similarity index 100% rename from core/bitmaps/video_to_substart_disable.bmp rename to aegisub/bitmaps/video_to_substart_disable.bmp diff --git a/core/bitmaps/website.bmp b/aegisub/bitmaps/website.bmp similarity index 100% rename from core/bitmaps/website.bmp rename to aegisub/bitmaps/website.bmp diff --git a/core/bitmaps/zoom_in.bmp b/aegisub/bitmaps/zoom_in.bmp similarity index 100% rename from core/bitmaps/zoom_in.bmp rename to aegisub/bitmaps/zoom_in.bmp diff --git a/core/bitmaps/zoom_out.bmp b/aegisub/bitmaps/zoom_out.bmp similarity index 100% rename from core/bitmaps/zoom_out.bmp rename to aegisub/bitmaps/zoom_out.bmp diff --git a/core/boost/assert.hpp b/aegisub/boost/assert.hpp similarity index 100% rename from core/boost/assert.hpp rename to aegisub/boost/assert.hpp diff --git a/core/boost/checked_delete.hpp b/aegisub/boost/checked_delete.hpp similarity index 100% rename from core/boost/checked_delete.hpp rename to aegisub/boost/checked_delete.hpp diff --git a/core/boost/shared_count.hpp b/aegisub/boost/shared_count.hpp similarity index 100% rename from core/boost/shared_count.hpp rename to aegisub/boost/shared_count.hpp diff --git a/core/boost/shared_ptr.hpp b/aegisub/boost/shared_ptr.hpp similarity index 100% rename from core/boost/shared_ptr.hpp rename to aegisub/boost/shared_ptr.hpp diff --git a/core/boost/throw_exception.hpp b/aegisub/boost/throw_exception.hpp similarity index 100% rename from core/boost/throw_exception.hpp rename to aegisub/boost/throw_exception.hpp diff --git a/core/boost/workaround.hpp b/aegisub/boost/workaround.hpp similarity index 100% rename from core/boost/workaround.hpp rename to aegisub/boost/workaround.hpp diff --git a/core/build/make-svn-rev-header-svn13.py b/aegisub/build/make-svn-rev-header-svn13.py similarity index 100% rename from core/build/make-svn-rev-header-svn13.py rename to aegisub/build/make-svn-rev-header-svn13.py diff --git a/core/build/make-svn-rev-header.py b/aegisub/build/make-svn-rev-header.py similarity index 100% rename from core/build/make-svn-rev-header.py rename to aegisub/build/make-svn-rev-header.py diff --git a/core/changelog.txt b/aegisub/changelog.txt similarity index 100% rename from core/changelog.txt rename to aegisub/changelog.txt diff --git a/core/colorspace.cpp b/aegisub/colorspace.cpp similarity index 100% rename from core/colorspace.cpp rename to aegisub/colorspace.cpp diff --git a/core/colorspace.h b/aegisub/colorspace.h similarity index 100% rename from core/colorspace.h rename to aegisub/colorspace.h diff --git a/core/dialog_about.cpp b/aegisub/dialog_about.cpp similarity index 100% rename from core/dialog_about.cpp rename to aegisub/dialog_about.cpp diff --git a/core/dialog_about.h b/aegisub/dialog_about.h similarity index 100% rename from core/dialog_about.h rename to aegisub/dialog_about.h diff --git a/core/dialog_associations.cpp b/aegisub/dialog_associations.cpp similarity index 100% rename from core/dialog_associations.cpp rename to aegisub/dialog_associations.cpp diff --git a/core/dialog_associations.h b/aegisub/dialog_associations.h similarity index 100% rename from core/dialog_associations.h rename to aegisub/dialog_associations.h diff --git a/core/dialog_attachments.cpp b/aegisub/dialog_attachments.cpp similarity index 100% rename from core/dialog_attachments.cpp rename to aegisub/dialog_attachments.cpp diff --git a/core/dialog_attachments.h b/aegisub/dialog_attachments.h similarity index 100% rename from core/dialog_attachments.h rename to aegisub/dialog_attachments.h diff --git a/core/dialog_automation.cpp b/aegisub/dialog_automation.cpp similarity index 100% rename from core/dialog_automation.cpp rename to aegisub/dialog_automation.cpp diff --git a/core/dialog_automation.h b/aegisub/dialog_automation.h similarity index 100% rename from core/dialog_automation.h rename to aegisub/dialog_automation.h diff --git a/core/dialog_colorpicker.cpp b/aegisub/dialog_colorpicker.cpp similarity index 100% rename from core/dialog_colorpicker.cpp rename to aegisub/dialog_colorpicker.cpp diff --git a/core/dialog_colorpicker.h b/aegisub/dialog_colorpicker.h similarity index 100% rename from core/dialog_colorpicker.h rename to aegisub/dialog_colorpicker.h diff --git a/core/dialog_export.cpp b/aegisub/dialog_export.cpp similarity index 100% rename from core/dialog_export.cpp rename to aegisub/dialog_export.cpp diff --git a/core/dialog_export.h b/aegisub/dialog_export.h similarity index 100% rename from core/dialog_export.h rename to aegisub/dialog_export.h diff --git a/core/dialog_fextracker.cpp b/aegisub/dialog_fextracker.cpp similarity index 100% rename from core/dialog_fextracker.cpp rename to aegisub/dialog_fextracker.cpp diff --git a/core/dialog_fextracker.h b/aegisub/dialog_fextracker.h similarity index 100% rename from core/dialog_fextracker.h rename to aegisub/dialog_fextracker.h diff --git a/core/dialog_fonts_collector.cpp b/aegisub/dialog_fonts_collector.cpp similarity index 100% rename from core/dialog_fonts_collector.cpp rename to aegisub/dialog_fonts_collector.cpp diff --git a/core/dialog_fonts_collector.h b/aegisub/dialog_fonts_collector.h similarity index 100% rename from core/dialog_fonts_collector.h rename to aegisub/dialog_fonts_collector.h diff --git a/core/dialog_hotkeys.cpp b/aegisub/dialog_hotkeys.cpp similarity index 100% rename from core/dialog_hotkeys.cpp rename to aegisub/dialog_hotkeys.cpp diff --git a/core/dialog_hotkeys.h b/aegisub/dialog_hotkeys.h similarity index 100% rename from core/dialog_hotkeys.h rename to aegisub/dialog_hotkeys.h diff --git a/core/dialog_jumpto.cpp b/aegisub/dialog_jumpto.cpp similarity index 100% rename from core/dialog_jumpto.cpp rename to aegisub/dialog_jumpto.cpp diff --git a/core/dialog_jumpto.h b/aegisub/dialog_jumpto.h similarity index 100% rename from core/dialog_jumpto.h rename to aegisub/dialog_jumpto.h diff --git a/core/dialog_options.cpp b/aegisub/dialog_options.cpp similarity index 100% rename from core/dialog_options.cpp rename to aegisub/dialog_options.cpp diff --git a/core/dialog_options.h b/aegisub/dialog_options.h similarity index 100% rename from core/dialog_options.h rename to aegisub/dialog_options.h diff --git a/core/dialog_paste_over.cpp b/aegisub/dialog_paste_over.cpp similarity index 100% rename from core/dialog_paste_over.cpp rename to aegisub/dialog_paste_over.cpp diff --git a/core/dialog_paste_over.h b/aegisub/dialog_paste_over.h similarity index 100% rename from core/dialog_paste_over.h rename to aegisub/dialog_paste_over.h diff --git a/core/dialog_progress.cpp b/aegisub/dialog_progress.cpp similarity index 100% rename from core/dialog_progress.cpp rename to aegisub/dialog_progress.cpp diff --git a/core/dialog_progress.h b/aegisub/dialog_progress.h similarity index 100% rename from core/dialog_progress.h rename to aegisub/dialog_progress.h diff --git a/core/dialog_properties.cpp b/aegisub/dialog_properties.cpp similarity index 100% rename from core/dialog_properties.cpp rename to aegisub/dialog_properties.cpp diff --git a/core/dialog_properties.h b/aegisub/dialog_properties.h similarity index 100% rename from core/dialog_properties.h rename to aegisub/dialog_properties.h diff --git a/core/dialog_resample.cpp b/aegisub/dialog_resample.cpp similarity index 100% rename from core/dialog_resample.cpp rename to aegisub/dialog_resample.cpp diff --git a/core/dialog_resample.h b/aegisub/dialog_resample.h similarity index 100% rename from core/dialog_resample.h rename to aegisub/dialog_resample.h diff --git a/core/dialog_search_replace.cpp b/aegisub/dialog_search_replace.cpp similarity index 100% rename from core/dialog_search_replace.cpp rename to aegisub/dialog_search_replace.cpp diff --git a/core/dialog_search_replace.h b/aegisub/dialog_search_replace.h similarity index 100% rename from core/dialog_search_replace.h rename to aegisub/dialog_search_replace.h diff --git a/core/dialog_selection.cpp b/aegisub/dialog_selection.cpp similarity index 100% rename from core/dialog_selection.cpp rename to aegisub/dialog_selection.cpp diff --git a/core/dialog_selection.h b/aegisub/dialog_selection.h similarity index 100% rename from core/dialog_selection.h rename to aegisub/dialog_selection.h diff --git a/core/dialog_shift_times.cpp b/aegisub/dialog_shift_times.cpp similarity index 100% rename from core/dialog_shift_times.cpp rename to aegisub/dialog_shift_times.cpp diff --git a/core/dialog_shift_times.h b/aegisub/dialog_shift_times.h similarity index 100% rename from core/dialog_shift_times.h rename to aegisub/dialog_shift_times.h diff --git a/core/dialog_splash.cpp b/aegisub/dialog_splash.cpp similarity index 100% rename from core/dialog_splash.cpp rename to aegisub/dialog_splash.cpp diff --git a/core/dialog_splash.h b/aegisub/dialog_splash.h similarity index 100% rename from core/dialog_splash.h rename to aegisub/dialog_splash.h diff --git a/core/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp similarity index 100% rename from core/dialog_style_editor.cpp rename to aegisub/dialog_style_editor.cpp diff --git a/core/dialog_style_editor.h b/aegisub/dialog_style_editor.h similarity index 100% rename from core/dialog_style_editor.h rename to aegisub/dialog_style_editor.h diff --git a/core/dialog_style_manager.cpp b/aegisub/dialog_style_manager.cpp similarity index 100% rename from core/dialog_style_manager.cpp rename to aegisub/dialog_style_manager.cpp diff --git a/core/dialog_style_manager.h b/aegisub/dialog_style_manager.h similarity index 100% rename from core/dialog_style_manager.h rename to aegisub/dialog_style_manager.h diff --git a/core/dialog_styling_assistant.cpp b/aegisub/dialog_styling_assistant.cpp similarity index 100% rename from core/dialog_styling_assistant.cpp rename to aegisub/dialog_styling_assistant.cpp diff --git a/core/dialog_styling_assistant.h b/aegisub/dialog_styling_assistant.h similarity index 100% rename from core/dialog_styling_assistant.h rename to aegisub/dialog_styling_assistant.h diff --git a/core/dialog_timing_processor.cpp b/aegisub/dialog_timing_processor.cpp similarity index 100% rename from core/dialog_timing_processor.cpp rename to aegisub/dialog_timing_processor.cpp diff --git a/core/dialog_timing_processor.h b/aegisub/dialog_timing_processor.h similarity index 100% rename from core/dialog_timing_processor.h rename to aegisub/dialog_timing_processor.h diff --git a/core/dialog_tip.cpp b/aegisub/dialog_tip.cpp similarity index 100% rename from core/dialog_tip.cpp rename to aegisub/dialog_tip.cpp diff --git a/core/dialog_tip.h b/aegisub/dialog_tip.h similarity index 100% rename from core/dialog_tip.h rename to aegisub/dialog_tip.h diff --git a/core/dialog_translation.cpp b/aegisub/dialog_translation.cpp similarity index 100% rename from core/dialog_translation.cpp rename to aegisub/dialog_translation.cpp diff --git a/core/dialog_translation.h b/aegisub/dialog_translation.h similarity index 100% rename from core/dialog_translation.h rename to aegisub/dialog_translation.h diff --git a/core/drop.cpp b/aegisub/drop.cpp similarity index 100% rename from core/drop.cpp rename to aegisub/drop.cpp diff --git a/core/drop.h b/aegisub/drop.h similarity index 100% rename from core/drop.h rename to aegisub/drop.h diff --git a/core/export_clean_info.cpp b/aegisub/export_clean_info.cpp similarity index 100% rename from core/export_clean_info.cpp rename to aegisub/export_clean_info.cpp diff --git a/core/export_clean_info.h b/aegisub/export_clean_info.h similarity index 100% rename from core/export_clean_info.h rename to aegisub/export_clean_info.h diff --git a/core/export_fixstyle.cpp b/aegisub/export_fixstyle.cpp similarity index 100% rename from core/export_fixstyle.cpp rename to aegisub/export_fixstyle.cpp diff --git a/core/export_fixstyle.h b/aegisub/export_fixstyle.h similarity index 100% rename from core/export_fixstyle.h rename to aegisub/export_fixstyle.h diff --git a/core/export_framerate.cpp b/aegisub/export_framerate.cpp similarity index 100% rename from core/export_framerate.cpp rename to aegisub/export_framerate.cpp diff --git a/core/export_framerate.h b/aegisub/export_framerate.h similarity index 100% rename from core/export_framerate.h rename to aegisub/export_framerate.h diff --git a/core/fextracker_main_events.cpp b/aegisub/fextracker_main_events.cpp similarity index 100% rename from core/fextracker_main_events.cpp rename to aegisub/fextracker_main_events.cpp diff --git a/core/fft.cpp b/aegisub/fft.cpp similarity index 100% rename from core/fft.cpp rename to aegisub/fft.cpp diff --git a/core/fft.h b/aegisub/fft.h similarity index 100% rename from core/fft.h rename to aegisub/fft.h diff --git a/core/frame_main.cpp b/aegisub/frame_main.cpp similarity index 100% rename from core/frame_main.cpp rename to aegisub/frame_main.cpp diff --git a/core/frame_main.h b/aegisub/frame_main.h similarity index 100% rename from core/frame_main.h rename to aegisub/frame_main.h diff --git a/core/frame_main_events.cpp b/aegisub/frame_main_events.cpp similarity index 100% rename from core/frame_main_events.cpp rename to aegisub/frame_main_events.cpp diff --git a/core/hilimod_textctrl.cpp b/aegisub/hilimod_textctrl.cpp similarity index 100% rename from core/hilimod_textctrl.cpp rename to aegisub/hilimod_textctrl.cpp diff --git a/core/hilimod_textctrl.h b/aegisub/hilimod_textctrl.h similarity index 100% rename from core/hilimod_textctrl.h rename to aegisub/hilimod_textctrl.h diff --git a/core/hotkeys.cpp b/aegisub/hotkeys.cpp similarity index 100% rename from core/hotkeys.cpp rename to aegisub/hotkeys.cpp diff --git a/core/hotkeys.h b/aegisub/hotkeys.h similarity index 100% rename from core/hotkeys.h rename to aegisub/hotkeys.h diff --git a/core/kana_table.cpp b/aegisub/kana_table.cpp similarity index 100% rename from core/kana_table.cpp rename to aegisub/kana_table.cpp diff --git a/core/kana_table.h b/aegisub/kana_table.h similarity index 100% rename from core/kana_table.h rename to aegisub/kana_table.h diff --git a/core/lavc_file.cpp b/aegisub/lavc_file.cpp similarity index 100% rename from core/lavc_file.cpp rename to aegisub/lavc_file.cpp diff --git a/core/lavc_file.h b/aegisub/lavc_file.h similarity index 100% rename from core/lavc_file.h rename to aegisub/lavc_file.h diff --git a/core/macosx/.DS_Store b/aegisub/macosx/.DS_Store similarity index 100% rename from core/macosx/.DS_Store rename to aegisub/macosx/.DS_Store diff --git a/core/macosx/._.DS_Store b/aegisub/macosx/._.DS_Store similarity index 100% rename from core/macosx/._.DS_Store rename to aegisub/macosx/._.DS_Store diff --git a/core/macosx/._Aegisub.icns b/aegisub/macosx/._Aegisub.icns similarity index 100% rename from core/macosx/._Aegisub.icns rename to aegisub/macosx/._Aegisub.icns diff --git a/core/macosx/._assIcon.icns b/aegisub/macosx/._assIcon.icns similarity index 100% rename from core/macosx/._assIcon.icns rename to aegisub/macosx/._assIcon.icns diff --git a/core/macosx/._srtIcon.icns b/aegisub/macosx/._srtIcon.icns similarity index 100% rename from core/macosx/._srtIcon.icns rename to aegisub/macosx/._srtIcon.icns diff --git a/core/macosx/._ssaIcon.icns b/aegisub/macosx/._ssaIcon.icns similarity index 100% rename from core/macosx/._ssaIcon.icns rename to aegisub/macosx/._ssaIcon.icns diff --git a/core/macosx/._txtIcon.icns b/aegisub/macosx/._txtIcon.icns similarity index 100% rename from core/macosx/._txtIcon.icns rename to aegisub/macosx/._txtIcon.icns diff --git a/core/macosx/Aegisub.icns b/aegisub/macosx/Aegisub.icns similarity index 100% rename from core/macosx/Aegisub.icns rename to aegisub/macosx/Aegisub.icns diff --git a/core/macosx/Aegisub_Prefix.pch b/aegisub/macosx/Aegisub_Prefix.pch similarity index 100% rename from core/macosx/Aegisub_Prefix.pch rename to aegisub/macosx/Aegisub_Prefix.pch diff --git a/core/macosx/English.lproj/InfoPlist.strings b/aegisub/macosx/English.lproj/InfoPlist.strings similarity index 100% rename from core/macosx/English.lproj/InfoPlist.strings rename to aegisub/macosx/English.lproj/InfoPlist.strings diff --git a/core/macosx/Info.plist b/aegisub/macosx/Info.plist similarity index 100% rename from core/macosx/Info.plist rename to aegisub/macosx/Info.plist diff --git a/core/macosx/Japanese.lproj/InfoPlist.strings b/aegisub/macosx/Japanese.lproj/InfoPlist.strings similarity index 100% rename from core/macosx/Japanese.lproj/InfoPlist.strings rename to aegisub/macosx/Japanese.lproj/InfoPlist.strings diff --git a/core/macosx/Japanese.lproj/main.nib/classes.nib b/aegisub/macosx/Japanese.lproj/main.nib/classes.nib similarity index 100% rename from core/macosx/Japanese.lproj/main.nib/classes.nib rename to aegisub/macosx/Japanese.lproj/main.nib/classes.nib diff --git a/core/macosx/Japanese.lproj/main.nib/info.nib b/aegisub/macosx/Japanese.lproj/main.nib/info.nib similarity index 100% rename from core/macosx/Japanese.lproj/main.nib/info.nib rename to aegisub/macosx/Japanese.lproj/main.nib/info.nib diff --git a/core/macosx/Japanese.lproj/main.nib/objects.xib b/aegisub/macosx/Japanese.lproj/main.nib/objects.xib similarity index 100% rename from core/macosx/Japanese.lproj/main.nib/objects.xib rename to aegisub/macosx/Japanese.lproj/main.nib/objects.xib diff --git a/core/macosx/acconf.h b/aegisub/macosx/acconf.h similarity index 100% rename from core/macosx/acconf.h rename to aegisub/macosx/acconf.h diff --git a/core/macosx/assIcon.icns b/aegisub/macosx/assIcon.icns similarity index 100% rename from core/macosx/assIcon.icns rename to aegisub/macosx/assIcon.icns diff --git a/core/macosx/bevelButton.cpp b/aegisub/macosx/bevelButton.cpp similarity index 100% rename from core/macosx/bevelButton.cpp rename to aegisub/macosx/bevelButton.cpp diff --git a/core/macosx/bevelButton.h b/aegisub/macosx/bevelButton.h similarity index 100% rename from core/macosx/bevelButton.h rename to aegisub/macosx/bevelButton.h diff --git a/core/macosx/macosx.xcodeproj/davedc.mode1 b/aegisub/macosx/macosx.xcodeproj/davedc.mode1 similarity index 100% rename from core/macosx/macosx.xcodeproj/davedc.mode1 rename to aegisub/macosx/macosx.xcodeproj/davedc.mode1 diff --git a/core/macosx/macosx.xcodeproj/davedc.pbxuser b/aegisub/macosx/macosx.xcodeproj/davedc.pbxuser similarity index 100% rename from core/macosx/macosx.xcodeproj/davedc.pbxuser rename to aegisub/macosx/macosx.xcodeproj/davedc.pbxuser diff --git a/core/macosx/macosx.xcodeproj/project.pbxproj b/aegisub/macosx/macosx.xcodeproj/project.pbxproj similarity index 100% rename from core/macosx/macosx.xcodeproj/project.pbxproj rename to aegisub/macosx/macosx.xcodeproj/project.pbxproj diff --git a/core/macosx/res.cpp b/aegisub/macosx/res.cpp similarity index 100% rename from core/macosx/res.cpp rename to aegisub/macosx/res.cpp diff --git a/core/macosx/res.h b/aegisub/macosx/res.h similarity index 100% rename from core/macosx/res.h rename to aegisub/macosx/res.h diff --git a/core/macosx/srtIcon.icns b/aegisub/macosx/srtIcon.icns similarity index 100% rename from core/macosx/srtIcon.icns rename to aegisub/macosx/srtIcon.icns diff --git a/core/macosx/ssaIcon.icns b/aegisub/macosx/ssaIcon.icns similarity index 100% rename from core/macosx/ssaIcon.icns rename to aegisub/macosx/ssaIcon.icns diff --git a/core/macosx/txtIcon.icns b/aegisub/macosx/txtIcon.icns similarity index 100% rename from core/macosx/txtIcon.icns rename to aegisub/macosx/txtIcon.icns diff --git a/core/main.cpp b/aegisub/main.cpp similarity index 100% rename from core/main.cpp rename to aegisub/main.cpp diff --git a/core/main.h b/aegisub/main.h similarity index 100% rename from core/main.h rename to aegisub/main.h diff --git a/core/md5.c b/aegisub/md5.c similarity index 100% rename from core/md5.c rename to aegisub/md5.c diff --git a/core/md5.h b/aegisub/md5.h similarity index 100% rename from core/md5.h rename to aegisub/md5.h diff --git a/core/mkv_wrap.cpp b/aegisub/mkv_wrap.cpp similarity index 100% rename from core/mkv_wrap.cpp rename to aegisub/mkv_wrap.cpp diff --git a/core/mkv_wrap.h b/aegisub/mkv_wrap.h similarity index 100% rename from core/mkv_wrap.h rename to aegisub/mkv_wrap.h diff --git a/core/mythes.cxx b/aegisub/mythes.cxx similarity index 100% rename from core/mythes.cxx rename to aegisub/mythes.cxx diff --git a/core/mythes.hxx b/aegisub/mythes.hxx similarity index 100% rename from core/mythes.hxx rename to aegisub/mythes.hxx diff --git a/core/options.cpp b/aegisub/options.cpp similarity index 100% rename from core/options.cpp rename to aegisub/options.cpp diff --git a/core/options.h b/aegisub/options.h similarity index 100% rename from core/options.h rename to aegisub/options.h diff --git a/core/posix/Makefile.am b/aegisub/posix/Makefile.am similarity index 100% rename from core/posix/Makefile.am rename to aegisub/posix/Makefile.am diff --git a/core/posix/defines.h b/aegisub/posix/defines.h similarity index 100% rename from core/posix/defines.h rename to aegisub/posix/defines.h diff --git a/core/posix/genres.sh b/aegisub/posix/genres.sh similarity index 100% rename from core/posix/genres.sh rename to aegisub/posix/genres.sh diff --git a/core/readme.txt b/aegisub/readme.txt similarity index 100% rename from core/readme.txt rename to aegisub/readme.txt diff --git a/core/res.rc b/aegisub/res.rc similarity index 100% rename from core/res.rc rename to aegisub/res.rc diff --git a/core/setup.cpp b/aegisub/setup.cpp similarity index 100% rename from core/setup.cpp rename to aegisub/setup.cpp diff --git a/core/setup0.h b/aegisub/setup0.h similarity index 100% rename from core/setup0.h rename to aegisub/setup0.h diff --git a/core/spellchecker.cpp b/aegisub/spellchecker.cpp similarity index 100% rename from core/spellchecker.cpp rename to aegisub/spellchecker.cpp diff --git a/core/spellchecker.h b/aegisub/spellchecker.h similarity index 100% rename from core/spellchecker.h rename to aegisub/spellchecker.h diff --git a/core/spellchecker_hunspell.cpp b/aegisub/spellchecker_hunspell.cpp similarity index 100% rename from core/spellchecker_hunspell.cpp rename to aegisub/spellchecker_hunspell.cpp diff --git a/core/spellchecker_hunspell.h b/aegisub/spellchecker_hunspell.h similarity index 100% rename from core/spellchecker_hunspell.h rename to aegisub/spellchecker_hunspell.h diff --git a/core/static_bmp.cpp b/aegisub/static_bmp.cpp similarity index 100% rename from core/static_bmp.cpp rename to aegisub/static_bmp.cpp diff --git a/core/static_bmp.h b/aegisub/static_bmp.h similarity index 100% rename from core/static_bmp.h rename to aegisub/static_bmp.h diff --git a/core/stdwx.cpp b/aegisub/stdwx.cpp similarity index 100% rename from core/stdwx.cpp rename to aegisub/stdwx.cpp diff --git a/core/stdwx.h b/aegisub/stdwx.h similarity index 100% rename from core/stdwx.h rename to aegisub/stdwx.h diff --git a/core/string_codec.cpp b/aegisub/string_codec.cpp similarity index 100% rename from core/string_codec.cpp rename to aegisub/string_codec.cpp diff --git a/core/string_codec.h b/aegisub/string_codec.h similarity index 100% rename from core/string_codec.h rename to aegisub/string_codec.h diff --git a/core/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp similarity index 100% rename from core/subs_edit_box.cpp rename to aegisub/subs_edit_box.cpp diff --git a/core/subs_edit_box.h b/aegisub/subs_edit_box.h similarity index 100% rename from core/subs_edit_box.h rename to aegisub/subs_edit_box.h diff --git a/core/subs_edit_ctrl.cpp b/aegisub/subs_edit_ctrl.cpp similarity index 100% rename from core/subs_edit_ctrl.cpp rename to aegisub/subs_edit_ctrl.cpp diff --git a/core/subs_edit_ctrl.h b/aegisub/subs_edit_ctrl.h similarity index 100% rename from core/subs_edit_ctrl.h rename to aegisub/subs_edit_ctrl.h diff --git a/core/subs_grid.cpp b/aegisub/subs_grid.cpp similarity index 100% rename from core/subs_grid.cpp rename to aegisub/subs_grid.cpp diff --git a/core/subs_grid.h b/aegisub/subs_grid.h similarity index 100% rename from core/subs_grid.h rename to aegisub/subs_grid.h diff --git a/core/subtitle_format.cpp b/aegisub/subtitle_format.cpp similarity index 100% rename from core/subtitle_format.cpp rename to aegisub/subtitle_format.cpp diff --git a/core/subtitle_format.h b/aegisub/subtitle_format.h similarity index 100% rename from core/subtitle_format.h rename to aegisub/subtitle_format.h diff --git a/core/subtitle_format_ass.cpp b/aegisub/subtitle_format_ass.cpp similarity index 100% rename from core/subtitle_format_ass.cpp rename to aegisub/subtitle_format_ass.cpp diff --git a/core/subtitle_format_ass.h b/aegisub/subtitle_format_ass.h similarity index 100% rename from core/subtitle_format_ass.h rename to aegisub/subtitle_format_ass.h diff --git a/core/subtitle_format_mkv.cpp b/aegisub/subtitle_format_mkv.cpp similarity index 100% rename from core/subtitle_format_mkv.cpp rename to aegisub/subtitle_format_mkv.cpp diff --git a/core/subtitle_format_mkv.h b/aegisub/subtitle_format_mkv.h similarity index 100% rename from core/subtitle_format_mkv.h rename to aegisub/subtitle_format_mkv.h diff --git a/core/subtitle_format_prs.cpp b/aegisub/subtitle_format_prs.cpp similarity index 100% rename from core/subtitle_format_prs.cpp rename to aegisub/subtitle_format_prs.cpp diff --git a/core/subtitle_format_prs.h b/aegisub/subtitle_format_prs.h similarity index 100% rename from core/subtitle_format_prs.h rename to aegisub/subtitle_format_prs.h diff --git a/core/subtitle_format_srt.cpp b/aegisub/subtitle_format_srt.cpp similarity index 100% rename from core/subtitle_format_srt.cpp rename to aegisub/subtitle_format_srt.cpp diff --git a/core/subtitle_format_srt.h b/aegisub/subtitle_format_srt.h similarity index 100% rename from core/subtitle_format_srt.h rename to aegisub/subtitle_format_srt.h diff --git a/core/subtitle_format_txt.cpp b/aegisub/subtitle_format_txt.cpp similarity index 100% rename from core/subtitle_format_txt.cpp rename to aegisub/subtitle_format_txt.cpp diff --git a/core/subtitle_format_txt.h b/aegisub/subtitle_format_txt.h similarity index 100% rename from core/subtitle_format_txt.h rename to aegisub/subtitle_format_txt.h diff --git a/core/subtitle_provider.cpp b/aegisub/subtitle_provider.cpp similarity index 100% rename from core/subtitle_provider.cpp rename to aegisub/subtitle_provider.cpp diff --git a/core/subtitle_provider.h b/aegisub/subtitle_provider.h similarity index 100% rename from core/subtitle_provider.h rename to aegisub/subtitle_provider.h diff --git a/core/subtitle_provider_asa.cpp b/aegisub/subtitle_provider_asa.cpp similarity index 100% rename from core/subtitle_provider_asa.cpp rename to aegisub/subtitle_provider_asa.cpp diff --git a/core/subtitle_provider_libass.cpp b/aegisub/subtitle_provider_libass.cpp similarity index 100% rename from core/subtitle_provider_libass.cpp rename to aegisub/subtitle_provider_libass.cpp diff --git a/core/text_file_reader.cpp b/aegisub/text_file_reader.cpp similarity index 100% rename from core/text_file_reader.cpp rename to aegisub/text_file_reader.cpp diff --git a/core/text_file_reader.h b/aegisub/text_file_reader.h similarity index 100% rename from core/text_file_reader.h rename to aegisub/text_file_reader.h diff --git a/core/text_file_writer.cpp b/aegisub/text_file_writer.cpp similarity index 100% rename from core/text_file_writer.cpp rename to aegisub/text_file_writer.cpp diff --git a/core/text_file_writer.h b/aegisub/text_file_writer.h similarity index 100% rename from core/text_file_writer.h rename to aegisub/text_file_writer.h diff --git a/core/thesaurus.cpp b/aegisub/thesaurus.cpp similarity index 100% rename from core/thesaurus.cpp rename to aegisub/thesaurus.cpp diff --git a/core/thesaurus.h b/aegisub/thesaurus.h similarity index 100% rename from core/thesaurus.h rename to aegisub/thesaurus.h diff --git a/core/thesaurus_myspell.cpp b/aegisub/thesaurus_myspell.cpp similarity index 100% rename from core/thesaurus_myspell.cpp rename to aegisub/thesaurus_myspell.cpp diff --git a/core/thesaurus_myspell.h b/aegisub/thesaurus_myspell.h similarity index 100% rename from core/thesaurus_myspell.h rename to aegisub/thesaurus_myspell.h diff --git a/core/timeedit_ctrl.cpp b/aegisub/timeedit_ctrl.cpp similarity index 100% rename from core/timeedit_ctrl.cpp rename to aegisub/timeedit_ctrl.cpp diff --git a/core/timeedit_ctrl.h b/aegisub/timeedit_ctrl.h similarity index 100% rename from core/timeedit_ctrl.h rename to aegisub/timeedit_ctrl.h diff --git a/core/toggle_bitmap.cpp b/aegisub/toggle_bitmap.cpp similarity index 100% rename from core/toggle_bitmap.cpp rename to aegisub/toggle_bitmap.cpp diff --git a/core/toggle_bitmap.h b/aegisub/toggle_bitmap.h similarity index 100% rename from core/toggle_bitmap.h rename to aegisub/toggle_bitmap.h diff --git a/core/utils.cpp b/aegisub/utils.cpp similarity index 100% rename from core/utils.cpp rename to aegisub/utils.cpp diff --git a/core/utils.h b/aegisub/utils.h similarity index 100% rename from core/utils.h rename to aegisub/utils.h diff --git a/core/validators.cpp b/aegisub/validators.cpp similarity index 100% rename from core/validators.cpp rename to aegisub/validators.cpp diff --git a/core/validators.h b/aegisub/validators.h similarity index 100% rename from core/validators.h rename to aegisub/validators.h diff --git a/core/variable_data.cpp b/aegisub/variable_data.cpp similarity index 100% rename from core/variable_data.cpp rename to aegisub/variable_data.cpp diff --git a/core/variable_data.h b/aegisub/variable_data.h similarity index 100% rename from core/variable_data.h rename to aegisub/variable_data.h diff --git a/core/version.cpp b/aegisub/version.cpp similarity index 100% rename from core/version.cpp rename to aegisub/version.cpp diff --git a/core/version.h b/aegisub/version.h similarity index 100% rename from core/version.h rename to aegisub/version.h diff --git a/core/vfr.cpp b/aegisub/vfr.cpp similarity index 100% rename from core/vfr.cpp rename to aegisub/vfr.cpp diff --git a/core/vfr.h b/aegisub/vfr.h similarity index 100% rename from core/vfr.h rename to aegisub/vfr.h diff --git a/core/vfw_wrap.cpp b/aegisub/vfw_wrap.cpp similarity index 100% rename from core/vfw_wrap.cpp rename to aegisub/vfw_wrap.cpp diff --git a/core/vfw_wrap.h b/aegisub/vfw_wrap.h similarity index 100% rename from core/vfw_wrap.h rename to aegisub/vfw_wrap.h diff --git a/core/video_box.cpp b/aegisub/video_box.cpp similarity index 100% rename from core/video_box.cpp rename to aegisub/video_box.cpp diff --git a/core/video_box.h b/aegisub/video_box.h similarity index 100% rename from core/video_box.h rename to aegisub/video_box.h diff --git a/core/video_display.cpp b/aegisub/video_display.cpp similarity index 100% rename from core/video_display.cpp rename to aegisub/video_display.cpp diff --git a/core/video_display.h b/aegisub/video_display.h similarity index 100% rename from core/video_display.h rename to aegisub/video_display.h diff --git a/core/video_provider.cpp b/aegisub/video_provider.cpp similarity index 100% rename from core/video_provider.cpp rename to aegisub/video_provider.cpp diff --git a/core/video_provider.h b/aegisub/video_provider.h similarity index 100% rename from core/video_provider.h rename to aegisub/video_provider.h diff --git a/core/video_provider_avs.cpp b/aegisub/video_provider_avs.cpp similarity index 100% rename from core/video_provider_avs.cpp rename to aegisub/video_provider_avs.cpp diff --git a/core/video_provider_avs.h b/aegisub/video_provider_avs.h similarity index 100% rename from core/video_provider_avs.h rename to aegisub/video_provider_avs.h diff --git a/core/video_provider_dshow.cpp b/aegisub/video_provider_dshow.cpp similarity index 100% rename from core/video_provider_dshow.cpp rename to aegisub/video_provider_dshow.cpp diff --git a/core/video_provider_dshow.h b/aegisub/video_provider_dshow.h similarity index 100% rename from core/video_provider_dshow.h rename to aegisub/video_provider_dshow.h diff --git a/core/video_provider_lavc.cpp b/aegisub/video_provider_lavc.cpp similarity index 100% rename from core/video_provider_lavc.cpp rename to aegisub/video_provider_lavc.cpp diff --git a/core/video_provider_lavc.h b/aegisub/video_provider_lavc.h similarity index 100% rename from core/video_provider_lavc.h rename to aegisub/video_provider_lavc.h diff --git a/core/video_slider.cpp b/aegisub/video_slider.cpp similarity index 100% rename from core/video_slider.cpp rename to aegisub/video_slider.cpp diff --git a/core/video_slider.h b/aegisub/video_slider.h similarity index 100% rename from core/video_slider.h rename to aegisub/video_slider.h diff --git a/core/video_zoom.cpp b/aegisub/video_zoom.cpp similarity index 100% rename from core/video_zoom.cpp rename to aegisub/video_zoom.cpp diff --git a/core/video_zoom.h b/aegisub/video_zoom.h similarity index 100% rename from core/video_zoom.h rename to aegisub/video_zoom.h diff --git a/core/yatta_wrap.cpp b/aegisub/yatta_wrap.cpp similarity index 100% rename from core/yatta_wrap.cpp rename to aegisub/yatta_wrap.cpp diff --git a/core/yatta_wrap.h b/aegisub/yatta_wrap.h similarity index 100% rename from core/yatta_wrap.h rename to aegisub/yatta_wrap.h