Revert "Merge branch 'master' of github.com:chrys87/fenrir"

This reverts commit 2ce5adba82, reversing
changes made to bf807c2519.

docu/user.md

@@ -1517,7 +1517,7 @@ Commands are python files with a special scheme. You can assign them to a shortc
 Good Examples: ["date.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py) (announce the Date), ["shut_up.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py) (interrupt output)
 the basic scheme for a command is as follows:
 
-    from fenrir.core import debug
+    from core import debug
     
     class command():
       def __init__(self):

docu/user.txt

@@ -1273,7 +1273,7 @@ Commands are python files with a special scheme. You can assign them to a shortc
 Good Examples: [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py|"date.py"]] (announce the Date), [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py|"shut_up.py"]] (interrupt output)
 the basic scheme for a command is as follows:
 
-  from fenrir.core import debug
+  from core import debug
   
   class command():
       def __init__(self):

setup.py

@@ -78,8 +78,8 @@ setup(
     author_email="chrysg@linux-a11y.org",
 
     # Packages
-    packages=find_packages('src'),
-    package_dir={'': 'src'},
+    packages=find_packages('src/fenrir'),
+    package_dir={'': 'src/fenrir'},
     scripts=['src/fenrir/fenrir','src/fenrir/fenrir-daemon'],
 
     # Include additional files into the package

src/fenrir/brailleDriver/brlapiDriver.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.core.brailleDriver import brailleDriver
+from core import debug
+from core.brailleDriver import brailleDriver
 
 class driver(brailleDriver):
     def __init__(self):

src/fenrir/brailleDriver/dummyDriver.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.core.brailleDriver import brailleDriver
+from core import debug
+from core.brailleDriver import brailleDriver
 
 class driver(brailleDriver):
     def __init__(self):

src/fenrir/commands/command_template.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/add_word_to_spell_check.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
+from core import debug
+from utils import word_utils
 import string
 initialized = False
 try:

src/fenrir/commands/commands/attribute_cursor.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import screen_utils
+from core import debug
+from utils import screen_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_1.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_10.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_2.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_3.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_4.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_5.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_6.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_7.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_8.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/bookmark_9.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
-from fenrir.utils import line_utils
+from core import debug
+from utils import mark_utils
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/braille_flush.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/braille_pan_left.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/braille_pan_right.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/braille_return_to_cursor.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_1.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_10.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_2.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_3.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_4.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_5.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_6.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_7.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_8.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_bookmark_9.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/clear_window_application.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/copy_marked_to_clipboard.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
+from core import debug
+from utils import mark_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/curr_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/curr_screen.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/curr_screen_after_cursor.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
+from core import debug
+from utils import mark_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/curr_screen_before_cursor.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
+from core import debug
+from utils import mark_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/cursor_column.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/cursor_lineno.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/cursor_position.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/cursor_read_to_end_of_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/date.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import datetime
 
 class command():

src/fenrir/commands/commands/dec_alsa_volume.py

@@ -11,7 +11,7 @@ try:
 except:
     pass
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/dec_sound_volume.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/dec_speech_pitch.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/dec_speech_rate.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/dec_speech_volume.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/exit_review.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/export_clipboard_to_file.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import os
 
 class command():

src/fenrir/commands/commands/export_clipboard_to_x.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import subprocess, os
 from subprocess import Popen, PIPE
 import _thread

src/fenrir/commands/commands/first_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/forward_keypress.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/import_clipboard_from_file.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
+from core import debug
+from utils import mark_utils
 import os
 
 class command():

src/fenrir/commands/commands/inc_alsa_volume.py

@@ -11,7 +11,7 @@ try:
 except:
     pass
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/inc_sound_volume.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/inc_speech_pitch.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/inc_speech_rate.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/inc_speech_volume.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import math
 
 class command():

src/fenrir/commands/commands/indent_curr_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/last_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/last_incoming.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/marked_text.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import mark_utils
+from core import debug
+from utils import mark_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/next_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/paste_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 import time
 
 class command():

src/fenrir/commands/commands/present_first_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/present_last_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/prev_clipboard.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/quit_fenrir.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/remove_marks.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/remove_word_from_spell_check.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
+from core import debug
+from utils import word_utils
 import string
 initialized = False
 try:

src/fenrir/commands/commands/review_bottom.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_curr_char.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_curr_char_phonetic.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_curr_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_curr_word.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
+from core import debug
+from utils import word_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_curr_word_phonetic.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
-from fenrir.utils import char_utils
+from core import debug
+from utils import word_utils
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_down.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_line_begin.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_line_end.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_line_first_char.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
-from fenrir.utils import char_utils
+from core import debug
+from utils import line_utils
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_line_last_char.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_next_char.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_next_char_phonetic.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_next_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_next_word.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
+from core import debug
+from utils import word_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_next_word_phonetic.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
-from fenrir.utils import char_utils
+from core import debug
+from utils import word_utils
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_prev_char.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_prev_char_phonetic.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_prev_line.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import line_utils
+from core import debug
+from utils import line_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_prev_word.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
+from core import debug
+from utils import word_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_prev_word_phonetic.py

@@ -4,9 +4,9 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import word_utils
-from fenrir.utils import char_utils
+from core import debug
+from utils import word_utils
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_top.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/review_up.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
-from fenrir.utils import char_utils
+from core import debug
+from utils import char_utils
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/set_bookmark_1.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/set_bookmark_10.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/set_bookmark_2.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/set_bookmark_3.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir/commands/commands/set_bookmark_4.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrir.core import debug
+from core import debug
 
 class command():
     def __init__(self):