diff --git a/src/fenrir-package/1ChangeTTY.opus b/src/fenrir/1ChangeTTY.opus
similarity index 100%
rename from src/fenrir-package/1ChangeTTY.opus
rename to src/fenrir/1ChangeTTY.opus
diff --git a/src/fenrir-package/1ChangeTTY.wav b/src/fenrir/1ChangeTTY.wav
similarity index 100%
rename from src/fenrir-package/1ChangeTTY.wav
rename to src/fenrir/1ChangeTTY.wav
diff --git a/src/fenrir-package/__init__.py b/src/fenrir/__init__.py
similarity index 100%
rename from src/fenrir-package/__init__.py
rename to src/fenrir/__init__.py
diff --git a/src/fenrir-package/braille/__init__.py b/src/fenrir/braille/__init__.py
similarity index 100%
rename from src/fenrir-package/braille/__init__.py
rename to src/fenrir/braille/__init__.py
diff --git a/src/fenrir-package/braille/braille.py b/src/fenrir/braille/braille.py
similarity index 100%
rename from src/fenrir-package/braille/braille.py
rename to src/fenrir/braille/braille.py
diff --git a/src/fenrir-package/commands/__init__.py b/src/fenrir/commands/__init__.py
similarity index 100%
rename from src/fenrir-package/commands/__init__.py
rename to src/fenrir/commands/__init__.py
diff --git a/src/fenrir-package/commands/command_template.py b/src/fenrir/commands/command_template.py
similarity index 100%
rename from src/fenrir-package/commands/command_template.py
rename to src/fenrir/commands/command_template.py
diff --git a/src/fenrir-package/commands/commands/__init__.py b/src/fenrir/commands/commands/__init__.py
similarity index 100%
rename from src/fenrir-package/commands/commands/__init__.py
rename to src/fenrir/commands/commands/__init__.py
diff --git a/src/fenrir-package/commands/commands/add_word_to_spell_check.py b/src/fenrir/commands/commands/add_word_to_spell_check.py
similarity index 100%
rename from src/fenrir-package/commands/commands/add_word_to_spell_check.py
rename to src/fenrir/commands/commands/add_word_to_spell_check.py
diff --git a/src/fenrir-package/commands/commands/bookmark_1.py b/src/fenrir/commands/commands/bookmark_1.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_1.py
rename to src/fenrir/commands/commands/bookmark_1.py
diff --git a/src/fenrir-package/commands/commands/bookmark_10.py b/src/fenrir/commands/commands/bookmark_10.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_10.py
rename to src/fenrir/commands/commands/bookmark_10.py
diff --git a/src/fenrir-package/commands/commands/bookmark_2.py b/src/fenrir/commands/commands/bookmark_2.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_2.py
rename to src/fenrir/commands/commands/bookmark_2.py
diff --git a/src/fenrir-package/commands/commands/bookmark_3.py b/src/fenrir/commands/commands/bookmark_3.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_3.py
rename to src/fenrir/commands/commands/bookmark_3.py
diff --git a/src/fenrir-package/commands/commands/bookmark_4.py b/src/fenrir/commands/commands/bookmark_4.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_4.py
rename to src/fenrir/commands/commands/bookmark_4.py
diff --git a/src/fenrir-package/commands/commands/bookmark_5.py b/src/fenrir/commands/commands/bookmark_5.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_5.py
rename to src/fenrir/commands/commands/bookmark_5.py
diff --git a/src/fenrir-package/commands/commands/bookmark_6.py b/src/fenrir/commands/commands/bookmark_6.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_6.py
rename to src/fenrir/commands/commands/bookmark_6.py
diff --git a/src/fenrir-package/commands/commands/bookmark_7.py b/src/fenrir/commands/commands/bookmark_7.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_7.py
rename to src/fenrir/commands/commands/bookmark_7.py
diff --git a/src/fenrir-package/commands/commands/bookmark_8.py b/src/fenrir/commands/commands/bookmark_8.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_8.py
rename to src/fenrir/commands/commands/bookmark_8.py
diff --git a/src/fenrir-package/commands/commands/bookmark_9.py b/src/fenrir/commands/commands/bookmark_9.py
similarity index 100%
rename from src/fenrir-package/commands/commands/bookmark_9.py
rename to src/fenrir/commands/commands/bookmark_9.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_1.py b/src/fenrir/commands/commands/clear_bookmark_1.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_1.py
rename to src/fenrir/commands/commands/clear_bookmark_1.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_10.py b/src/fenrir/commands/commands/clear_bookmark_10.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_10.py
rename to src/fenrir/commands/commands/clear_bookmark_10.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_2.py b/src/fenrir/commands/commands/clear_bookmark_2.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_2.py
rename to src/fenrir/commands/commands/clear_bookmark_2.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_3.py b/src/fenrir/commands/commands/clear_bookmark_3.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_3.py
rename to src/fenrir/commands/commands/clear_bookmark_3.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_4.py b/src/fenrir/commands/commands/clear_bookmark_4.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_4.py
rename to src/fenrir/commands/commands/clear_bookmark_4.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_5.py b/src/fenrir/commands/commands/clear_bookmark_5.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_5.py
rename to src/fenrir/commands/commands/clear_bookmark_5.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_6.py b/src/fenrir/commands/commands/clear_bookmark_6.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_6.py
rename to src/fenrir/commands/commands/clear_bookmark_6.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_7.py b/src/fenrir/commands/commands/clear_bookmark_7.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_7.py
rename to src/fenrir/commands/commands/clear_bookmark_7.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_8.py b/src/fenrir/commands/commands/clear_bookmark_8.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_8.py
rename to src/fenrir/commands/commands/clear_bookmark_8.py
diff --git a/src/fenrir-package/commands/commands/clear_bookmark_9.py b/src/fenrir/commands/commands/clear_bookmark_9.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_bookmark_9.py
rename to src/fenrir/commands/commands/clear_bookmark_9.py
diff --git a/src/fenrir-package/commands/commands/clear_clipboard.py b/src/fenrir/commands/commands/clear_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_clipboard.py
rename to src/fenrir/commands/commands/clear_clipboard.py
diff --git a/src/fenrir-package/commands/commands/clear_window_application.py b/src/fenrir/commands/commands/clear_window_application.py
similarity index 100%
rename from src/fenrir-package/commands/commands/clear_window_application.py
rename to src/fenrir/commands/commands/clear_window_application.py
diff --git a/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py b/src/fenrir/commands/commands/copy_marked_to_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/copy_marked_to_clipboard.py
rename to src/fenrir/commands/commands/copy_marked_to_clipboard.py
diff --git a/src/fenrir-package/commands/commands/curr_char_phonetic.py b/src/fenrir/commands/commands/curr_char_phonetic.py
similarity index 100%
rename from src/fenrir-package/commands/commands/curr_char_phonetic.py
rename to src/fenrir/commands/commands/curr_char_phonetic.py
diff --git a/src/fenrir-package/commands/commands/curr_clipboard.py b/src/fenrir/commands/commands/curr_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/curr_clipboard.py
rename to src/fenrir/commands/commands/curr_clipboard.py
diff --git a/src/fenrir-package/commands/commands/curr_screen.py b/src/fenrir/commands/commands/curr_screen.py
similarity index 100%
rename from src/fenrir-package/commands/commands/curr_screen.py
rename to src/fenrir/commands/commands/curr_screen.py
diff --git a/src/fenrir-package/commands/commands/curr_screen_after_cursor.py b/src/fenrir/commands/commands/curr_screen_after_cursor.py
similarity index 100%
rename from src/fenrir-package/commands/commands/curr_screen_after_cursor.py
rename to src/fenrir/commands/commands/curr_screen_after_cursor.py
diff --git a/src/fenrir-package/commands/commands/curr_screen_before_cursor.py b/src/fenrir/commands/commands/curr_screen_before_cursor.py
similarity index 100%
rename from src/fenrir-package/commands/commands/curr_screen_before_cursor.py
rename to src/fenrir/commands/commands/curr_screen_before_cursor.py
diff --git a/src/fenrir-package/commands/commands/curr_word_phonetic.py b/src/fenrir/commands/commands/curr_word_phonetic.py
similarity index 100%
rename from src/fenrir-package/commands/commands/curr_word_phonetic.py
rename to src/fenrir/commands/commands/curr_word_phonetic.py
diff --git a/src/fenrir-package/commands/commands/cursor_position.py b/src/fenrir/commands/commands/cursor_position.py
similarity index 100%
rename from src/fenrir-package/commands/commands/cursor_position.py
rename to src/fenrir/commands/commands/cursor_position.py
diff --git a/src/fenrir-package/commands/commands/date.py b/src/fenrir/commands/commands/date.py
similarity index 100%
rename from src/fenrir-package/commands/commands/date.py
rename to src/fenrir/commands/commands/date.py
diff --git a/src/fenrir-package/commands/commands/dec_sound_volume.py b/src/fenrir/commands/commands/dec_sound_volume.py
similarity index 100%
rename from src/fenrir-package/commands/commands/dec_sound_volume.py
rename to src/fenrir/commands/commands/dec_sound_volume.py
diff --git a/src/fenrir-package/commands/commands/dec_speech_pitch.py b/src/fenrir/commands/commands/dec_speech_pitch.py
similarity index 100%
rename from src/fenrir-package/commands/commands/dec_speech_pitch.py
rename to src/fenrir/commands/commands/dec_speech_pitch.py
diff --git a/src/fenrir-package/commands/commands/dec_speech_rate.py b/src/fenrir/commands/commands/dec_speech_rate.py
similarity index 100%
rename from src/fenrir-package/commands/commands/dec_speech_rate.py
rename to src/fenrir/commands/commands/dec_speech_rate.py
diff --git a/src/fenrir-package/commands/commands/dec_speech_volume.py b/src/fenrir/commands/commands/dec_speech_volume.py
similarity index 100%
rename from src/fenrir-package/commands/commands/dec_speech_volume.py
rename to src/fenrir/commands/commands/dec_speech_volume.py
diff --git a/src/fenrir-package/commands/commands/exit_review.py b/src/fenrir/commands/commands/exit_review.py
similarity index 100%
rename from src/fenrir-package/commands/commands/exit_review.py
rename to src/fenrir/commands/commands/exit_review.py
diff --git a/src/fenrir-package/commands/commands/first_clipboard.py b/src/fenrir/commands/commands/first_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/first_clipboard.py
rename to src/fenrir/commands/commands/first_clipboard.py
diff --git a/src/fenrir-package/commands/commands/forward_keypress.py b/src/fenrir/commands/commands/forward_keypress.py
similarity index 100%
rename from src/fenrir-package/commands/commands/forward_keypress.py
rename to src/fenrir/commands/commands/forward_keypress.py
diff --git a/src/fenrir-package/commands/commands/inc_sound_volume.py b/src/fenrir/commands/commands/inc_sound_volume.py
similarity index 100%
rename from src/fenrir-package/commands/commands/inc_sound_volume.py
rename to src/fenrir/commands/commands/inc_sound_volume.py
diff --git a/src/fenrir-package/commands/commands/inc_speech_pitch.py b/src/fenrir/commands/commands/inc_speech_pitch.py
similarity index 100%
rename from src/fenrir-package/commands/commands/inc_speech_pitch.py
rename to src/fenrir/commands/commands/inc_speech_pitch.py
diff --git a/src/fenrir-package/commands/commands/inc_speech_rate.py b/src/fenrir/commands/commands/inc_speech_rate.py
similarity index 100%
rename from src/fenrir-package/commands/commands/inc_speech_rate.py
rename to src/fenrir/commands/commands/inc_speech_rate.py
diff --git a/src/fenrir-package/commands/commands/inc_speech_volume.py b/src/fenrir/commands/commands/inc_speech_volume.py
similarity index 100%
rename from src/fenrir-package/commands/commands/inc_speech_volume.py
rename to src/fenrir/commands/commands/inc_speech_volume.py
diff --git a/src/fenrir-package/commands/commands/indent_curr_line.py b/src/fenrir/commands/commands/indent_curr_line.py
similarity index 100%
rename from src/fenrir-package/commands/commands/indent_curr_line.py
rename to src/fenrir/commands/commands/indent_curr_line.py
diff --git a/src/fenrir-package/commands/commands/last_clipboard.py b/src/fenrir/commands/commands/last_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/last_clipboard.py
rename to src/fenrir/commands/commands/last_clipboard.py
diff --git a/src/fenrir-package/commands/commands/last_incoming.py b/src/fenrir/commands/commands/last_incoming.py
similarity index 100%
rename from src/fenrir-package/commands/commands/last_incoming.py
rename to src/fenrir/commands/commands/last_incoming.py
diff --git a/src/fenrir-package/commands/commands/linux_paste_clipboard.py b/src/fenrir/commands/commands/linux_paste_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/linux_paste_clipboard.py
rename to src/fenrir/commands/commands/linux_paste_clipboard.py
diff --git a/src/fenrir-package/commands/commands/marked_text.py b/src/fenrir/commands/commands/marked_text.py
similarity index 100%
rename from src/fenrir-package/commands/commands/marked_text.py
rename to src/fenrir/commands/commands/marked_text.py
diff --git a/src/fenrir-package/commands/commands/next_clipboard.py b/src/fenrir/commands/commands/next_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/next_clipboard.py
rename to src/fenrir/commands/commands/next_clipboard.py
diff --git a/src/fenrir-package/commands/commands/present_first_line.py b/src/fenrir/commands/commands/present_first_line.py
similarity index 100%
rename from src/fenrir-package/commands/commands/present_first_line.py
rename to src/fenrir/commands/commands/present_first_line.py
diff --git a/src/fenrir-package/commands/commands/present_last_line.py b/src/fenrir/commands/commands/present_last_line.py
similarity index 100%
rename from src/fenrir-package/commands/commands/present_last_line.py
rename to src/fenrir/commands/commands/present_last_line.py
diff --git a/src/fenrir-package/commands/commands/prev_clipboard.py b/src/fenrir/commands/commands/prev_clipboard.py
similarity index 100%
rename from src/fenrir-package/commands/commands/prev_clipboard.py
rename to src/fenrir/commands/commands/prev_clipboard.py
diff --git a/src/fenrir-package/commands/commands/quit_fenrir.py b/src/fenrir/commands/commands/quit_fenrir.py
similarity index 100%
rename from src/fenrir-package/commands/commands/quit_fenrir.py
rename to src/fenrir/commands/commands/quit_fenrir.py
diff --git a/src/fenrir-package/commands/commands/remove_marks.py b/src/fenrir/commands/commands/remove_marks.py
similarity index 100%
rename from src/fenrir-package/commands/commands/remove_marks.py
rename to src/fenrir/commands/commands/remove_marks.py
diff --git a/src/fenrir-package/commands/commands/remove_word_from_spell_check.py b/src/fenrir/commands/commands/remove_word_from_spell_check.py
similarity index 100%
rename from src/fenrir-package/commands/commands/remove_word_from_spell_check.py
rename to src/fenrir/commands/commands/remove_word_from_spell_check.py
diff --git a/src/fenrir-package/commands/commands/review_bottom.py b/src/fenrir/commands/commands/review_bottom.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_bottom.py
rename to src/fenrir/commands/commands/review_bottom.py
diff --git a/src/fenrir-package/commands/commands/review_curr_char.py b/src/fenrir/commands/commands/review_curr_char.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_curr_char.py
rename to src/fenrir/commands/commands/review_curr_char.py
diff --git a/src/fenrir-package/commands/commands/review_curr_line.py b/src/fenrir/commands/commands/review_curr_line.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_curr_line.py
rename to src/fenrir/commands/commands/review_curr_line.py
diff --git a/src/fenrir-package/commands/commands/review_curr_word.py b/src/fenrir/commands/commands/review_curr_word.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_curr_word.py
rename to src/fenrir/commands/commands/review_curr_word.py
diff --git a/src/fenrir-package/commands/commands/review_down.py b/src/fenrir/commands/commands/review_down.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_down.py
rename to src/fenrir/commands/commands/review_down.py
diff --git a/src/fenrir-package/commands/commands/review_line_begin.py b/src/fenrir/commands/commands/review_line_begin.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_line_begin.py
rename to src/fenrir/commands/commands/review_line_begin.py
diff --git a/src/fenrir-package/commands/commands/review_line_end.py b/src/fenrir/commands/commands/review_line_end.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_line_end.py
rename to src/fenrir/commands/commands/review_line_end.py
diff --git a/src/fenrir-package/commands/commands/review_line_last_char.py b/src/fenrir/commands/commands/review_line_last_char.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_line_last_char.py
rename to src/fenrir/commands/commands/review_line_last_char.py
diff --git a/src/fenrir-package/commands/commands/review_next_char.py b/src/fenrir/commands/commands/review_next_char.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_next_char.py
rename to src/fenrir/commands/commands/review_next_char.py
diff --git a/src/fenrir-package/commands/commands/review_next_line.py b/src/fenrir/commands/commands/review_next_line.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_next_line.py
rename to src/fenrir/commands/commands/review_next_line.py
diff --git a/src/fenrir-package/commands/commands/review_next_word.py b/src/fenrir/commands/commands/review_next_word.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_next_word.py
rename to src/fenrir/commands/commands/review_next_word.py
diff --git a/src/fenrir-package/commands/commands/review_prev_char.py b/src/fenrir/commands/commands/review_prev_char.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_prev_char.py
rename to src/fenrir/commands/commands/review_prev_char.py
diff --git a/src/fenrir-package/commands/commands/review_prev_line.py b/src/fenrir/commands/commands/review_prev_line.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_prev_line.py
rename to src/fenrir/commands/commands/review_prev_line.py
diff --git a/src/fenrir-package/commands/commands/review_prev_word.py b/src/fenrir/commands/commands/review_prev_word.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_prev_word.py
rename to src/fenrir/commands/commands/review_prev_word.py
diff --git a/src/fenrir-package/commands/commands/review_top.py b/src/fenrir/commands/commands/review_top.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_top.py
rename to src/fenrir/commands/commands/review_top.py
diff --git a/src/fenrir-package/commands/commands/review_up.py b/src/fenrir/commands/commands/review_up.py
similarity index 100%
rename from src/fenrir-package/commands/commands/review_up.py
rename to src/fenrir/commands/commands/review_up.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_1.py b/src/fenrir/commands/commands/set_bookmark_1.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_1.py
rename to src/fenrir/commands/commands/set_bookmark_1.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_10.py b/src/fenrir/commands/commands/set_bookmark_10.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_10.py
rename to src/fenrir/commands/commands/set_bookmark_10.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_2.py b/src/fenrir/commands/commands/set_bookmark_2.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_2.py
rename to src/fenrir/commands/commands/set_bookmark_2.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_3.py b/src/fenrir/commands/commands/set_bookmark_3.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_3.py
rename to src/fenrir/commands/commands/set_bookmark_3.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_4.py b/src/fenrir/commands/commands/set_bookmark_4.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_4.py
rename to src/fenrir/commands/commands/set_bookmark_4.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_5.py b/src/fenrir/commands/commands/set_bookmark_5.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_5.py
rename to src/fenrir/commands/commands/set_bookmark_5.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_6.py b/src/fenrir/commands/commands/set_bookmark_6.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_6.py
rename to src/fenrir/commands/commands/set_bookmark_6.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_7.py b/src/fenrir/commands/commands/set_bookmark_7.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_7.py
rename to src/fenrir/commands/commands/set_bookmark_7.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_8.py b/src/fenrir/commands/commands/set_bookmark_8.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_8.py
rename to src/fenrir/commands/commands/set_bookmark_8.py
diff --git a/src/fenrir-package/commands/commands/set_bookmark_9.py b/src/fenrir/commands/commands/set_bookmark_9.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_bookmark_9.py
rename to src/fenrir/commands/commands/set_bookmark_9.py
diff --git a/src/fenrir-package/commands/commands/set_mark.py b/src/fenrir/commands/commands/set_mark.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_mark.py
rename to src/fenrir/commands/commands/set_mark.py
diff --git a/src/fenrir-package/commands/commands/set_window_application.py b/src/fenrir/commands/commands/set_window_application.py
similarity index 100%
rename from src/fenrir-package/commands/commands/set_window_application.py
rename to src/fenrir/commands/commands/set_window_application.py
diff --git a/src/fenrir-package/commands/commands/shut_up.py b/src/fenrir/commands/commands/shut_up.py
similarity index 100%
rename from src/fenrir-package/commands/commands/shut_up.py
rename to src/fenrir/commands/commands/shut_up.py
diff --git a/src/fenrir-package/commands/commands/spell_check.py b/src/fenrir/commands/commands/spell_check.py
similarity index 100%
rename from src/fenrir-package/commands/commands/spell_check.py
rename to src/fenrir/commands/commands/spell_check.py
diff --git a/src/fenrir-package/commands/commands/time.py b/src/fenrir/commands/commands/time.py
similarity index 100%
rename from src/fenrir-package/commands/commands/time.py
rename to src/fenrir/commands/commands/time.py
diff --git a/src/fenrir-package/commands/commands/toggle_auto_read.py b/src/fenrir/commands/commands/toggle_auto_read.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_auto_read.py
rename to src/fenrir/commands/commands/toggle_auto_read.py
diff --git a/src/fenrir-package/commands/commands/toggle_auto_spell_check.py b/src/fenrir/commands/commands/toggle_auto_spell_check.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_auto_spell_check.py
rename to src/fenrir/commands/commands/toggle_auto_spell_check.py
diff --git a/src/fenrir-package/commands/commands/toggle_braille.py b/src/fenrir/commands/commands/toggle_braille.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_braille.py
rename to src/fenrir/commands/commands/toggle_braille.py
diff --git a/src/fenrir-package/commands/commands/toggle_output.py b/src/fenrir/commands/commands/toggle_output.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_output.py
rename to src/fenrir/commands/commands/toggle_output.py
diff --git a/src/fenrir-package/commands/commands/toggle_punctuation_level.py b/src/fenrir/commands/commands/toggle_punctuation_level.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_punctuation_level.py
rename to src/fenrir/commands/commands/toggle_punctuation_level.py
diff --git a/src/fenrir-package/commands/commands/toggle_sound.py b/src/fenrir/commands/commands/toggle_sound.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_sound.py
rename to src/fenrir/commands/commands/toggle_sound.py
diff --git a/src/fenrir-package/commands/commands/toggle_speech.py b/src/fenrir/commands/commands/toggle_speech.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_speech.py
rename to src/fenrir/commands/commands/toggle_speech.py
diff --git a/src/fenrir-package/commands/commands/toggle_tutorial_mode.py b/src/fenrir/commands/commands/toggle_tutorial_mode.py
similarity index 100%
rename from src/fenrir-package/commands/commands/toggle_tutorial_mode.py
rename to src/fenrir/commands/commands/toggle_tutorial_mode.py
diff --git a/src/fenrir-package/commands/onApplicationChange/test.py b/src/fenrir/commands/onApplicationChange/test.py
similarity index 100%
rename from src/fenrir-package/commands/onApplicationChange/test.py
rename to src/fenrir/commands/onApplicationChange/test.py
diff --git a/src/fenrir-package/commands/onInput/10000-shut_up.py b/src/fenrir/commands/onInput/10000-shut_up.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/10000-shut_up.py
rename to src/fenrir/commands/onInput/10000-shut_up.py
diff --git a/src/fenrir-package/commands/onInput/45000-present_char_if_cursor_change_horizontal.py b/src/fenrir/commands/onInput/45000-present_char_if_cursor_change_horizontal.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/45000-present_char_if_cursor_change_horizontal.py
rename to src/fenrir/commands/onInput/45000-present_char_if_cursor_change_horizontal.py
diff --git a/src/fenrir-package/commands/onInput/50000-char_echo.py b/src/fenrir/commands/onInput/50000-char_echo.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/50000-char_echo.py
rename to src/fenrir/commands/onInput/50000-char_echo.py
diff --git a/src/fenrir-package/commands/onInput/55000-present_line_if_cursor_change_vertical.py b/src/fenrir/commands/onInput/55000-present_line_if_cursor_change_vertical.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/55000-present_line_if_cursor_change_vertical.py
rename to src/fenrir/commands/onInput/55000-present_line_if_cursor_change_vertical.py
diff --git a/src/fenrir-package/commands/onInput/60000-word_echo.py b/src/fenrir/commands/onInput/60000-word_echo.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/60000-word_echo.py
rename to src/fenrir/commands/onInput/60000-word_echo.py
diff --git a/src/fenrir-package/commands/onInput/62000-spell_check.py b/src/fenrir/commands/onInput/62000-spell_check.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/62000-spell_check.py
rename to src/fenrir/commands/onInput/62000-spell_check.py
diff --git a/src/fenrir-package/commands/onInput/65000-char_delete_echo.py b/src/fenrir/commands/onInput/65000-char_delete_echo.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/65000-char_delete_echo.py
rename to src/fenrir/commands/onInput/65000-char_delete_echo.py
diff --git a/src/fenrir-package/commands/onInput/80000-capslock.py b/src/fenrir/commands/onInput/80000-capslock.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/80000-capslock.py
rename to src/fenrir/commands/onInput/80000-capslock.py
diff --git a/src/fenrir-package/commands/onInput/80300-scrolllock.py b/src/fenrir/commands/onInput/80300-scrolllock.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/80300-scrolllock.py
rename to src/fenrir/commands/onInput/80300-scrolllock.py
diff --git a/src/fenrir-package/commands/onInput/80500-numlock.py b/src/fenrir/commands/onInput/80500-numlock.py
similarity index 100%
rename from src/fenrir-package/commands/onInput/80500-numlock.py
rename to src/fenrir/commands/onInput/80500-numlock.py
diff --git a/src/fenrir-package/commands/onScreenChanged/10000-shut_up.py b/src/fenrir/commands/onScreenChanged/10000-shut_up.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenChanged/10000-shut_up.py
rename to src/fenrir/commands/onScreenChanged/10000-shut_up.py
diff --git a/src/fenrir-package/commands/onScreenChanged/80000-screen_change_announcement.py b/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenChanged/80000-screen_change_announcement.py
rename to src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py
diff --git a/src/fenrir-package/commands/onScreenChanged/85000-screen_chnage_reset_marks.py b/src/fenrir/commands/onScreenChanged/85000-screen_chnage_reset_marks.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenChanged/85000-screen_chnage_reset_marks.py
rename to src/fenrir/commands/onScreenChanged/85000-screen_chnage_reset_marks.py
diff --git a/src/fenrir-package/commands/onScreenChanged/85000-screen_chnage_reset_review.py b/src/fenrir/commands/onScreenChanged/85000-screen_chnage_reset_review.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenChanged/85000-screen_chnage_reset_review.py
rename to src/fenrir/commands/onScreenChanged/85000-screen_chnage_reset_review.py
diff --git a/src/fenrir-package/commands/onScreenChanged/89000-screen_chnage_leve_review_mode.py b/src/fenrir/commands/onScreenChanged/89000-screen_chnage_leve_review_mode.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenChanged/89000-screen_chnage_leve_review_mode.py
rename to src/fenrir/commands/onScreenChanged/89000-screen_chnage_leve_review_mode.py
diff --git a/src/fenrir-package/commands/onScreenUpdate/70000-incoming.py b/src/fenrir/commands/onScreenUpdate/70000-incoming.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenUpdate/70000-incoming.py
rename to src/fenrir/commands/onScreenUpdate/70000-incoming.py
diff --git a/src/fenrir-package/commands/onScreenUpdate/75000-incoming_promote.py b/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenUpdate/75000-incoming_promote.py
rename to src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py
diff --git a/src/fenrir-package/commands/onScreenUpdate/__init__.py b/src/fenrir/commands/onScreenUpdate/__init__.py
similarity index 100%
rename from src/fenrir-package/commands/onScreenUpdate/__init__.py
rename to src/fenrir/commands/onScreenUpdate/__init__.py
diff --git a/src/fenrir-package/commands/onSwitchApplicationProfile/__init__.py b/src/fenrir/commands/onSwitchApplicationProfile/__init__.py
similarity index 100%
rename from src/fenrir-package/commands/onSwitchApplicationProfile/__init__.py
rename to src/fenrir/commands/onSwitchApplicationProfile/__init__.py
diff --git a/src/fenrir-package/commands/onSwitchApplicationProfile/agetty.py b/src/fenrir/commands/onSwitchApplicationProfile/agetty.py
similarity index 100%
rename from src/fenrir-package/commands/onSwitchApplicationProfile/agetty.py
rename to src/fenrir/commands/onSwitchApplicationProfile/agetty.py
diff --git a/src/fenrir-package/commands/onSwitchApplicationProfile/bash.py b/src/fenrir/commands/onSwitchApplicationProfile/bash.py
similarity index 100%
rename from src/fenrir-package/commands/onSwitchApplicationProfile/bash.py
rename to src/fenrir/commands/onSwitchApplicationProfile/bash.py
diff --git a/src/fenrir-package/commands/onSwitchApplicationProfile/default.py b/src/fenrir/commands/onSwitchApplicationProfile/default.py
similarity index 100%
rename from src/fenrir-package/commands/onSwitchApplicationProfile/default.py
rename to src/fenrir/commands/onSwitchApplicationProfile/default.py
diff --git a/src/fenrir-package/commands/onSwitchApplicationProfile/vim.py b/src/fenrir/commands/onSwitchApplicationProfile/vim.py
similarity index 100%
rename from src/fenrir-package/commands/onSwitchApplicationProfile/vim.py
rename to src/fenrir/commands/onSwitchApplicationProfile/vim.py
diff --git a/src/fenrir-package/commands/switchTrigger_template.py b/src/fenrir/commands/switchTrigger_template.py
similarity index 100%
rename from src/fenrir-package/commands/switchTrigger_template.py
rename to src/fenrir/commands/switchTrigger_template.py
diff --git a/src/fenrir-package/core/applicationManager.py b/src/fenrir/core/applicationManager.py
similarity index 100%
rename from src/fenrir-package/core/applicationManager.py
rename to src/fenrir/core/applicationManager.py
diff --git a/src/fenrir-package/core/commandManager.py b/src/fenrir/core/commandManager.py
similarity index 100%
rename from src/fenrir-package/core/commandManager.py
rename to src/fenrir/core/commandManager.py
diff --git a/src/fenrir-package/core/commands.py b/src/fenrir/core/commands.py
similarity index 100%
rename from src/fenrir-package/core/commands.py
rename to src/fenrir/core/commands.py
diff --git a/src/fenrir-package/core/cursorManager.py b/src/fenrir/core/cursorManager.py
similarity index 100%
rename from src/fenrir-package/core/cursorManager.py
rename to src/fenrir/core/cursorManager.py
diff --git a/src/fenrir-package/core/debug.py b/src/fenrir/core/debug.py
similarity index 100%
rename from src/fenrir-package/core/debug.py
rename to src/fenrir/core/debug.py
diff --git a/src/fenrir-package/core/environment.py b/src/fenrir/core/environment.py
similarity index 100%
rename from src/fenrir-package/core/environment.py
rename to src/fenrir/core/environment.py
diff --git a/src/fenrir-package/core/generalInformation.py b/src/fenrir/core/generalInformation.py
similarity index 100%
rename from src/fenrir-package/core/generalInformation.py
rename to src/fenrir/core/generalInformation.py
diff --git a/src/fenrir-package/core/inputEvent.py b/src/fenrir/core/inputEvent.py
similarity index 100%
rename from src/fenrir-package/core/inputEvent.py
rename to src/fenrir/core/inputEvent.py
diff --git a/src/fenrir-package/core/inputManager.py b/src/fenrir/core/inputManager.py
similarity index 100%
rename from src/fenrir-package/core/inputManager.py
rename to src/fenrir/core/inputManager.py
diff --git a/src/fenrir-package/core/outputManager.py b/src/fenrir/core/outputManager.py
similarity index 100%
rename from src/fenrir-package/core/outputManager.py
rename to src/fenrir/core/outputManager.py
diff --git a/src/fenrir-package/core/punctuationManager.py b/src/fenrir/core/punctuationManager.py
similarity index 100%
rename from src/fenrir-package/core/punctuationManager.py
rename to src/fenrir/core/punctuationManager.py
diff --git a/src/fenrir-package/core/runtime.py b/src/fenrir/core/runtime.py
similarity index 100%
rename from src/fenrir-package/core/runtime.py
rename to src/fenrir/core/runtime.py
diff --git a/src/fenrir-package/core/screenData.py b/src/fenrir/core/screenData.py
similarity index 100%
rename from src/fenrir-package/core/screenData.py
rename to src/fenrir/core/screenData.py
diff --git a/src/fenrir-package/core/screenManager.py b/src/fenrir/core/screenManager.py
similarity index 100%
rename from src/fenrir-package/core/screenManager.py
rename to src/fenrir/core/screenManager.py
diff --git a/src/fenrir-package/core/settings.py b/src/fenrir/core/settings.py
similarity index 100%
rename from src/fenrir-package/core/settings.py
rename to src/fenrir/core/settings.py
diff --git a/src/fenrir-package/core/settingsManager.py b/src/fenrir/core/settingsManager.py
similarity index 100%
rename from src/fenrir-package/core/settingsManager.py
rename to src/fenrir/core/settingsManager.py
diff --git a/src/fenrir-package/fenrir.py b/src/fenrir/fenrir.py
similarity index 100%
rename from src/fenrir-package/fenrir.py
rename to src/fenrir/fenrir.py
diff --git a/src/fenrir-package/inputDriver/evdev.py b/src/fenrir/inputDriver/evdev.py
similarity index 100%
rename from src/fenrir-package/inputDriver/evdev.py
rename to src/fenrir/inputDriver/evdev.py
diff --git a/src/fenrir-package/screenDriver/__init__.py b/src/fenrir/screenDriver/__init__.py
similarity index 100%
rename from src/fenrir-package/screenDriver/__init__.py
rename to src/fenrir/screenDriver/__init__.py
diff --git a/src/fenrir-package/screenDriver/linux.py b/src/fenrir/screenDriver/linux.py
similarity index 100%
rename from src/fenrir-package/screenDriver/linux.py
rename to src/fenrir/screenDriver/linux.py
diff --git a/src/fenrir-package/sound.py b/src/fenrir/sound.py
similarity index 100%
rename from src/fenrir-package/sound.py
rename to src/fenrir/sound.py
diff --git a/src/fenrir-package/soundDriver/__init__.py b/src/fenrir/soundDriver/__init__.py
similarity index 100%
rename from src/fenrir-package/soundDriver/__init__.py
rename to src/fenrir/soundDriver/__init__.py
diff --git a/src/fenrir-package/soundDriver/generic.py b/src/fenrir/soundDriver/generic.py
similarity index 100%
rename from src/fenrir-package/soundDriver/generic.py
rename to src/fenrir/soundDriver/generic.py
diff --git a/src/fenrir-package/soundDriver/gstreamer.py b/src/fenrir/soundDriver/gstreamer.py
similarity index 100%
rename from src/fenrir-package/soundDriver/gstreamer.py
rename to src/fenrir/soundDriver/gstreamer.py
diff --git a/src/fenrir-package/speechDriver/Readme.md b/src/fenrir/speechDriver/Readme.md
similarity index 100%
rename from src/fenrir-package/speechDriver/Readme.md
rename to src/fenrir/speechDriver/Readme.md
diff --git a/src/fenrir-package/speechDriver/__init__.py b/src/fenrir/speechDriver/__init__.py
similarity index 100%
rename from src/fenrir-package/speechDriver/__init__.py
rename to src/fenrir/speechDriver/__init__.py
diff --git a/src/fenrir-package/speechDriver/espeak.py b/src/fenrir/speechDriver/espeak.py
similarity index 100%
rename from src/fenrir-package/speechDriver/espeak.py
rename to src/fenrir/speechDriver/espeak.py
diff --git a/src/fenrir-package/speechDriver/generic.py b/src/fenrir/speechDriver/generic.py
similarity index 100%
rename from src/fenrir-package/speechDriver/generic.py
rename to src/fenrir/speechDriver/generic.py
diff --git a/src/fenrir-package/speechDriver/speechd.py b/src/fenrir/speechDriver/speechd.py
similarity index 100%
rename from src/fenrir-package/speechDriver/speechd.py
rename to src/fenrir/speechDriver/speechd.py
diff --git a/src/fenrir-package/utils/__init__.py b/src/fenrir/utils/__init__.py
similarity index 100%
rename from src/fenrir-package/utils/__init__.py
rename to src/fenrir/utils/__init__.py
diff --git a/src/fenrir-package/utils/char_utils.py b/src/fenrir/utils/char_utils.py
similarity index 100%
rename from src/fenrir-package/utils/char_utils.py
rename to src/fenrir/utils/char_utils.py
diff --git a/src/fenrir-package/utils/fenrir-config.py b/src/fenrir/utils/fenrir-config.py
similarity index 100%
rename from src/fenrir-package/utils/fenrir-config.py
rename to src/fenrir/utils/fenrir-config.py
diff --git a/src/fenrir-package/utils/line_utils.py b/src/fenrir/utils/line_utils.py
similarity index 100%
rename from src/fenrir-package/utils/line_utils.py
rename to src/fenrir/utils/line_utils.py
diff --git a/src/fenrir-package/utils/mark_utils.py b/src/fenrir/utils/mark_utils.py
similarity index 100%
rename from src/fenrir-package/utils/mark_utils.py
rename to src/fenrir/utils/mark_utils.py
diff --git a/src/fenrir-package/utils/review_utils.py b/src/fenrir/utils/review_utils.py
similarity index 100%
rename from src/fenrir-package/utils/review_utils.py
rename to src/fenrir/utils/review_utils.py
diff --git a/src/fenrir-package/utils/word_utils.py b/src/fenrir/utils/word_utils.py
similarity index 100%
rename from src/fenrir-package/utils/word_utils.py
rename to src/fenrir/utils/word_utils.py