diff --git a/aegilib/ClassDiagram1.cd b/athenasub/ClassDiagram1.cd
similarity index 100%
rename from aegilib/ClassDiagram1.cd
rename to athenasub/ClassDiagram1.cd
diff --git a/aegilib/aegilib.vcproj b/athenasub/aegilib.vcproj
similarity index 100%
rename from aegilib/aegilib.vcproj
rename to athenasub/aegilib.vcproj
diff --git a/aegilib/aegilib_2008.vcproj b/athenasub/aegilib_2008.vcproj
similarity index 100%
rename from aegilib/aegilib_2008.vcproj
rename to athenasub/aegilib_2008.vcproj
diff --git a/aegilib/aegilib_icl.icproj b/athenasub/aegilib_icl.icproj
similarity index 100%
rename from aegilib/aegilib_icl.icproj
rename to athenasub/aegilib_icl.icproj
diff --git a/aegilib/aegilib_icl.vcproj b/athenasub/aegilib_icl.vcproj
similarity index 100%
rename from aegilib/aegilib_icl.vcproj
rename to athenasub/aegilib_icl.vcproj
diff --git a/aegilib/docs/subtitles.jude b/athenasub/docs/subtitles.jude
similarity index 100%
rename from aegilib/docs/subtitles.jude
rename to athenasub/docs/subtitles.jude
diff --git a/aegilib/docs/subtitles.png b/athenasub/docs/subtitles.png
similarity index 100%
rename from aegilib/docs/subtitles.png
rename to athenasub/docs/subtitles.png
diff --git a/aegilib/include/athenasub/api.h b/athenasub/include/athenasub/api.h
similarity index 100%
rename from aegilib/include/athenasub/api.h
rename to athenasub/include/athenasub/api.h
diff --git a/aegilib/include/athenasub/athenastring.h b/athenasub/include/athenasub/athenastring.h
similarity index 100%
rename from aegilib/include/athenasub/athenastring.h
rename to athenasub/include/athenasub/athenastring.h
diff --git a/aegilib/include/athenasub/athenasub.h b/athenasub/include/athenasub/athenasub.h
similarity index 100%
rename from aegilib/include/athenasub/athenasub.h
rename to athenasub/include/athenasub/athenasub.h
diff --git a/aegilib/include/athenasub/athenatime.h b/athenasub/include/athenasub/athenatime.h
similarity index 100%
rename from aegilib/include/athenasub/athenatime.h
rename to athenasub/include/athenasub/athenatime.h
diff --git a/aegilib/include/athenasub/athenawin.h b/athenasub/include/athenasub/athenawin.h
similarity index 100%
rename from aegilib/include/athenasub/athenawin.h
rename to athenasub/include/athenasub/athenawin.h
diff --git a/aegilib/include/athenasub/exception.h b/athenasub/include/athenasub/exception.h
similarity index 100%
rename from aegilib/include/athenasub/exception.h
rename to athenasub/include/athenasub/exception.h
diff --git a/aegilib/include/athenasub/interfaces.h b/athenasub/include/athenasub/interfaces.h
similarity index 100%
rename from aegilib/include/athenasub/interfaces.h
rename to athenasub/include/athenasub/interfaces.h
diff --git a/aegilib/include/athenasub/range.h b/athenasub/include/athenasub/range.h
similarity index 100%
rename from aegilib/include/athenasub/range.h
rename to athenasub/include/athenasub/range.h
diff --git a/aegilib/include/athenasub/tr1.h b/athenasub/include/athenasub/tr1.h
similarity index 100%
rename from aegilib/include/athenasub/tr1.h
rename to athenasub/include/athenasub/tr1.h
diff --git a/aegilib/src/action.cpp b/athenasub/src/action.cpp
similarity index 100%
rename from aegilib/src/action.cpp
rename to athenasub/src/action.cpp
diff --git a/aegilib/src/action.h b/athenasub/src/action.h
similarity index 100%
rename from aegilib/src/action.h
rename to athenasub/src/action.h
diff --git a/aegilib/src/actionlist.cpp b/athenasub/src/actionlist.cpp
similarity index 100%
rename from aegilib/src/actionlist.cpp
rename to athenasub/src/actionlist.cpp
diff --git a/aegilib/src/actionlist.h b/athenasub/src/actionlist.h
similarity index 100%
rename from aegilib/src/actionlist.h
rename to athenasub/src/actionlist.h
diff --git a/aegilib/src/athenastring.cpp b/athenasub/src/athenastring.cpp
similarity index 100%
rename from aegilib/src/athenastring.cpp
rename to athenasub/src/athenastring.cpp
diff --git a/aegilib/src/athenatime.cpp b/athenasub/src/athenatime.cpp
similarity index 100%
rename from aegilib/src/athenatime.cpp
rename to athenasub/src/athenatime.cpp
diff --git a/aegilib/src/colour.cpp b/athenasub/src/colour.cpp
similarity index 100%
rename from aegilib/src/colour.cpp
rename to athenasub/src/colour.cpp
diff --git a/aegilib/src/colour.h b/athenasub/src/colour.h
similarity index 100%
rename from aegilib/src/colour.h
rename to athenasub/src/colour.h
diff --git a/aegilib/src/controller.cpp b/athenasub/src/controller.cpp
similarity index 100%
rename from aegilib/src/controller.cpp
rename to athenasub/src/controller.cpp
diff --git a/aegilib/src/controller.h b/athenasub/src/controller.h
similarity index 100%
rename from aegilib/src/controller.h
rename to athenasub/src/controller.h
diff --git a/aegilib/src/exception.cpp b/athenasub/src/exception.cpp
similarity index 100%
rename from aegilib/src/exception.cpp
rename to athenasub/src/exception.cpp
diff --git a/aegilib/src/fastbuffer.h b/athenasub/src/fastbuffer.h
similarity index 100%
rename from aegilib/src/fastbuffer.h
rename to athenasub/src/fastbuffer.h
diff --git a/aegilib/src/format_handler.h b/athenasub/src/format_handler.h
similarity index 100%
rename from aegilib/src/format_handler.h
rename to athenasub/src/format_handler.h
diff --git a/aegilib/src/format_manager.cpp b/athenasub/src/format_manager.cpp
similarity index 100%
rename from aegilib/src/format_manager.cpp
rename to athenasub/src/format_manager.cpp
diff --git a/aegilib/src/format_manager.h b/athenasub/src/format_manager.h
similarity index 100%
rename from aegilib/src/format_manager.h
rename to athenasub/src/format_manager.h
diff --git a/aegilib/src/formats/format_ass.cpp b/athenasub/src/formats/format_ass.cpp
similarity index 100%
rename from aegilib/src/formats/format_ass.cpp
rename to athenasub/src/formats/format_ass.cpp
diff --git a/aegilib/src/formats/format_ass.h b/athenasub/src/formats/format_ass.h
similarity index 100%
rename from aegilib/src/formats/format_ass.h
rename to athenasub/src/formats/format_ass.h
diff --git a/aegilib/src/formats/format_ass_dialogue.cpp b/athenasub/src/formats/format_ass_dialogue.cpp
similarity index 100%
rename from aegilib/src/formats/format_ass_dialogue.cpp
rename to athenasub/src/formats/format_ass_dialogue.cpp
diff --git a/aegilib/src/formats/format_ass_dialogue.h b/athenasub/src/formats/format_ass_dialogue.h
similarity index 100%
rename from aegilib/src/formats/format_ass_dialogue.h
rename to athenasub/src/formats/format_ass_dialogue.h
diff --git a/aegilib/src/formats/format_ass_dialogue_delta.cpp b/athenasub/src/formats/format_ass_dialogue_delta.cpp
similarity index 100%
rename from aegilib/src/formats/format_ass_dialogue_delta.cpp
rename to athenasub/src/formats/format_ass_dialogue_delta.cpp
diff --git a/aegilib/src/formats/format_ass_dialogue_delta.h b/athenasub/src/formats/format_ass_dialogue_delta.h
similarity index 100%
rename from aegilib/src/formats/format_ass_dialogue_delta.h
rename to athenasub/src/formats/format_ass_dialogue_delta.h
diff --git a/aegilib/src/formats/format_ass_plain.h b/athenasub/src/formats/format_ass_plain.h
similarity index 100%
rename from aegilib/src/formats/format_ass_plain.h
rename to athenasub/src/formats/format_ass_plain.h
diff --git a/aegilib/src/formats/format_ass_style.cpp b/athenasub/src/formats/format_ass_style.cpp
similarity index 100%
rename from aegilib/src/formats/format_ass_style.cpp
rename to athenasub/src/formats/format_ass_style.cpp
diff --git a/aegilib/src/formats/format_ass_style.h b/athenasub/src/formats/format_ass_style.h
similarity index 100%
rename from aegilib/src/formats/format_ass_style.h
rename to athenasub/src/formats/format_ass_style.h
diff --git a/aegilib/src/libathenasub.cpp b/athenasub/src/libathenasub.cpp
similarity index 100%
rename from aegilib/src/libathenasub.cpp
rename to athenasub/src/libathenasub.cpp
diff --git a/aegilib/src/libathenasub.h b/athenasub/src/libathenasub.h
similarity index 100%
rename from aegilib/src/libathenasub.h
rename to athenasub/src/libathenasub.h
diff --git a/aegilib/src/model.cpp b/athenasub/src/model.cpp
similarity index 100%
rename from aegilib/src/model.cpp
rename to athenasub/src/model.cpp
diff --git a/aegilib/src/model.h b/athenasub/src/model.h
similarity index 100%
rename from aegilib/src/model.h
rename to athenasub/src/model.h
diff --git a/aegilib/src/notification.h b/athenasub/src/notification.h
similarity index 100%
rename from aegilib/src/notification.h
rename to athenasub/src/notification.h
diff --git a/aegilib/src/prec.cpp b/athenasub/src/prec.cpp
similarity index 100%
rename from aegilib/src/prec.cpp
rename to athenasub/src/prec.cpp
diff --git a/aegilib/src/prec.h b/athenasub/src/prec.h
similarity index 100%
rename from aegilib/src/prec.h
rename to athenasub/src/prec.h
diff --git a/aegilib/src/section.cpp b/athenasub/src/section.cpp
similarity index 100%
rename from aegilib/src/section.cpp
rename to athenasub/src/section.cpp
diff --git a/aegilib/src/section.h b/athenasub/src/section.h
similarity index 100%
rename from aegilib/src/section.h
rename to athenasub/src/section.h
diff --git a/aegilib/src/section_entry.cpp b/athenasub/src/section_entry.cpp
similarity index 100%
rename from aegilib/src/section_entry.cpp
rename to athenasub/src/section_entry.cpp
diff --git a/aegilib/src/section_entry.h b/athenasub/src/section_entry.h
similarity index 100%
rename from aegilib/src/section_entry.h
rename to athenasub/src/section_entry.h
diff --git a/aegilib/src/section_entry_dialogue.h b/athenasub/src/section_entry_dialogue.h
similarity index 100%
rename from aegilib/src/section_entry_dialogue.h
rename to athenasub/src/section_entry_dialogue.h
diff --git a/aegilib/src/section_entry_style.h b/athenasub/src/section_entry_style.h
similarity index 100%
rename from aegilib/src/section_entry_style.h
rename to athenasub/src/section_entry_style.h
diff --git a/aegilib/src/selection.cpp b/athenasub/src/selection.cpp
similarity index 100%
rename from aegilib/src/selection.cpp
rename to athenasub/src/selection.cpp
diff --git a/aegilib/src/selection.h b/athenasub/src/selection.h
similarity index 100%
rename from aegilib/src/selection.h
rename to athenasub/src/selection.h
diff --git a/aegilib/src/serialize.h b/athenasub/src/serialize.h
similarity index 100%
rename from aegilib/src/serialize.h
rename to athenasub/src/serialize.h
diff --git a/aegilib/src/stdint.h b/athenasub/src/stdint.h
similarity index 100%
rename from aegilib/src/stdint.h
rename to athenasub/src/stdint.h
diff --git a/aegilib/src/text_file_reader.cpp b/athenasub/src/text_file_reader.cpp
similarity index 100%
rename from aegilib/src/text_file_reader.cpp
rename to athenasub/src/text_file_reader.cpp
diff --git a/aegilib/src/text_file_reader.h b/athenasub/src/text_file_reader.h
similarity index 100%
rename from aegilib/src/text_file_reader.h
rename to athenasub/src/text_file_reader.h
diff --git a/aegilib/src/text_file_writer.cpp b/athenasub/src/text_file_writer.cpp
similarity index 100%
rename from aegilib/src/text_file_writer.cpp
rename to athenasub/src/text_file_writer.cpp
diff --git a/aegilib/src/text_file_writer.h b/athenasub/src/text_file_writer.h
similarity index 100%
rename from aegilib/src/text_file_writer.h
rename to athenasub/src/text_file_writer.h
diff --git a/aegilib/src/time.cpp b/athenasub/src/time.cpp
similarity index 100%
rename from aegilib/src/time.cpp
rename to athenasub/src/time.cpp
diff --git a/aegilib/src/tokenizer.cpp b/athenasub/src/tokenizer.cpp
similarity index 100%
rename from aegilib/src/tokenizer.cpp
rename to athenasub/src/tokenizer.cpp
diff --git a/aegilib/src/tokenizer.h b/athenasub/src/tokenizer.h
similarity index 100%
rename from aegilib/src/tokenizer.h
rename to athenasub/src/tokenizer.h
diff --git a/aegilib/src/utils.cpp b/athenasub/src/utils.cpp
similarity index 100%
rename from aegilib/src/utils.cpp
rename to athenasub/src/utils.cpp
diff --git a/aegilib/src/utils.h b/athenasub/src/utils.h
similarity index 100%
rename from aegilib/src/utils.h
rename to athenasub/src/utils.h
diff --git a/aegilib/src/version.cpp b/athenasub/src/version.cpp
similarity index 100%
rename from aegilib/src/version.cpp
rename to athenasub/src/version.cpp
diff --git a/aegilib/src/version.h b/athenasub/src/version.h
similarity index 100%
rename from aegilib/src/version.h
rename to athenasub/src/version.h
diff --git a/aegilib/src/view.cpp b/athenasub/src/view.cpp
similarity index 100%
rename from aegilib/src/view.cpp
rename to athenasub/src/view.cpp
diff --git a/aegilib/test/omp_pipeline.cpp b/athenasub/test/omp_pipeline.cpp
similarity index 100%
rename from aegilib/test/omp_pipeline.cpp
rename to athenasub/test/omp_pipeline.cpp
diff --git a/aegilib/test/src/main.cpp b/athenasub/test/src/main.cpp
similarity index 100%
rename from aegilib/test/src/main.cpp
rename to athenasub/test/src/main.cpp
diff --git a/aegilib/test/src/text_file_reader.cpp b/athenasub/test/src/text_file_reader.cpp
similarity index 100%
rename from aegilib/test/src/text_file_reader.cpp
rename to athenasub/test/src/text_file_reader.cpp
diff --git a/aegilib/test/src/text_file_reader.h b/athenasub/test/src/text_file_reader.h
similarity index 100%
rename from aegilib/test/src/text_file_reader.h
rename to athenasub/test/src/text_file_reader.h
diff --git a/aegilib/test/src/text_file_writer.cpp b/athenasub/test/src/text_file_writer.cpp
similarity index 100%
rename from aegilib/test/src/text_file_writer.cpp
rename to athenasub/test/src/text_file_writer.cpp
diff --git a/aegilib/test/src/text_file_writer.h b/athenasub/test/src/text_file_writer.h
similarity index 100%
rename from aegilib/test/src/text_file_writer.h
rename to athenasub/test/src/text_file_writer.h
diff --git a/aegilib/test/test.vcproj b/athenasub/test/test.vcproj
similarity index 100%
rename from aegilib/test/test.vcproj
rename to athenasub/test/test.vcproj
diff --git a/aegilib/test/test_2008.vcproj b/athenasub/test/test_2008.vcproj
similarity index 100%
rename from aegilib/test/test_2008.vcproj
rename to athenasub/test/test_2008.vcproj
diff --git a/aegilib/test/test_icl.icproj b/athenasub/test/test_icl.icproj
similarity index 100%
rename from aegilib/test/test_icl.icproj
rename to athenasub/test/test_icl.icproj
diff --git a/aegilib/test/test_icl.vcproj b/athenasub/test/test_icl.vcproj
similarity index 100%
rename from aegilib/test/test_icl.vcproj
rename to athenasub/test/test_icl.vcproj
diff --git a/aegilib/todo.txt b/athenasub/todo.txt
similarity index 100%
rename from aegilib/todo.txt
rename to athenasub/todo.txt