fix merge

src/fenrir

@@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in
 if not fenrirPath in sys.path:
     sys.path.append(fenrirPath)
 
-from core import fenrirManager
+from fenrirscreenreader.core import fenrirManager
 
 def main():
     app = fenrirManager.fenrirManager()

src/fenrir-daemon

@@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in
 if not fenrirPath in sys.path:
     sys.path.append(fenrirPath)
 
-from core import fenrirManager
+from fenrirscreenreader.core import fenrirManager
 from daemonize import Daemonize
 
 pidFile = "/run/fenrir.pid"

src/fenrir/core/environment.py

@@ -1,29 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from core import debug
-from core.settingsData import settingsData
-from core.runtimeData import runtimeData
-from core.screenData import screenData
-from core.outputData import outputData
-from core.generalData import generalData
-from core import commandData
-from core.inputData import inputData
-from core.punctuationData import punctuationData
-
-environment = {
-'screen': screenData,
-'runtime': runtimeData,
-'general': generalData,
-'settings': settingsData,
-'commandInfo': commandData.commandInfo,
-'commandBuffer': commandData.commandBuffer,
-'input': inputData,
-'punctuation': punctuationData,
-'output': outputData,
-'soundIcons': {},
-'bindings': {},
-}

src/fenrirscreenreader/brailleDriver/brlapiDriver.py

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

src/fenrirscreenreader/brailleDriver/debugDriver.py

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

src/fenrirscreenreader/brailleDriver/dummyDriver.py

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

src/fenrirscreenreader/commands/command_template.py

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

src/fenrirscreenreader/commands/commands/00_init_commands.py

@@ -4,7 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from core import debug
+from fenrirscreenreader.core import debug
 
 # this command is just to initialize stuff.
 # like init index lists in memoryManager

src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py

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

src/fenrirscreenreader/commands/commands/attribute_cursor.py

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

src/fenrirscreenreader/commands/commands/bookmark_1.py

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

src/fenrirscreenreader/commands/commands/bookmark_10.py

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

src/fenrirscreenreader/commands/commands/bookmark_2.py

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

src/fenrirscreenreader/commands/commands/bookmark_3.py

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

src/fenrirscreenreader/commands/commands/bookmark_4.py

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

src/fenrirscreenreader/commands/commands/bookmark_5.py

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

src/fenrirscreenreader/commands/commands/bookmark_6.py

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

src/fenrirscreenreader/commands/commands/bookmark_7.py

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

src/fenrirscreenreader/commands/commands/bookmark_8.py

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

src/fenrirscreenreader/commands/commands/bookmark_9.py

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

src/fenrirscreenreader/commands/commands/braille_flush.py

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

src/fenrirscreenreader/commands/commands/braille_pan_left.py

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

src/fenrirscreenreader/commands/commands/braille_pan_right.py

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

src/fenrirscreenreader/commands/commands/braille_return_to_cursor.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_1.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_10.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_2.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_3.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_4.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_5.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_6.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_7.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_8.py

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

src/fenrirscreenreader/commands/commands/clear_bookmark_9.py

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

src/fenrirscreenreader/commands/commands/clear_clipboard.py

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

src/fenrirscreenreader/commands/commands/clear_window_application.py

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

src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py

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

src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py

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

src/fenrirscreenreader/commands/commands/curr_clipboard.py

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

src/fenrirscreenreader/commands/commands/curr_screen.py

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

src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py

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

src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py

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

src/fenrirscreenreader/commands/commands/cursor_column.py

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

src/fenrirscreenreader/commands/commands/cursor_lineno.py

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

src/fenrirscreenreader/commands/commands/cursor_position.py

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

src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py

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

src/fenrirscreenreader/commands/commands/date.py

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

src/fenrirscreenreader/commands/commands/dec_alsa_volume.py

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

src/fenrirscreenreader/commands/commands/dec_sound_volume.py

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

src/fenrirscreenreader/commands/commands/dec_speech_pitch.py

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

src/fenrirscreenreader/commands/commands/dec_speech_rate.py

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

src/fenrirscreenreader/commands/commands/dec_speech_volume.py

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

src/fenrirscreenreader/commands/commands/exit_review.py

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

src/fenrirscreenreader/commands/commands/export_clipboard_to_file.py

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

src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py

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

src/fenrirscreenreader/commands/commands/first_clipboard.py

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

src/fenrirscreenreader/commands/commands/forward_keypress.py

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

src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py

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

src/fenrirscreenreader/commands/commands/inc_alsa_volume.py

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

src/fenrirscreenreader/commands/commands/inc_sound_volume.py

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

src/fenrirscreenreader/commands/commands/inc_speech_pitch.py

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

src/fenrirscreenreader/commands/commands/inc_speech_rate.py

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

src/fenrirscreenreader/commands/commands/inc_speech_volume.py

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

src/fenrirscreenreader/commands/commands/indent_curr_line.py

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

src/fenrirscreenreader/commands/commands/last_clipboard.py

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

src/fenrirscreenreader/commands/commands/last_incoming.py

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

src/fenrirscreenreader/commands/commands/marked_text.py

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

src/fenrirscreenreader/commands/commands/next_clipboard.py

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

src/fenrirscreenreader/commands/commands/paste_clipboard.py

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

src/fenrirscreenreader/commands/commands/present_first_line.py

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

src/fenrirscreenreader/commands/commands/present_last_line.py

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

src/fenrirscreenreader/commands/commands/prev_clipboard.py

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

src/fenrirscreenreader/commands/commands/quit_fenrir.py

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

src/fenrirscreenreader/commands/commands/remove_marks.py

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

src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py

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

src/fenrirscreenreader/commands/commands/review_bottom.py

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

src/fenrirscreenreader/commands/commands/review_curr_char.py

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

src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py

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

src/fenrirscreenreader/commands/commands/review_curr_line.py

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

src/fenrirscreenreader/commands/commands/review_curr_word.py

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

src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py

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

src/fenrirscreenreader/commands/commands/review_down.py

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

src/fenrirscreenreader/commands/commands/review_line_begin.py

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

src/fenrirscreenreader/commands/commands/review_line_end.py

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

src/fenrirscreenreader/commands/commands/review_line_first_char.py

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

src/fenrirscreenreader/commands/commands/review_line_last_char.py

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

src/fenrirscreenreader/commands/commands/review_next_char.py

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

src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py

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

src/fenrirscreenreader/commands/commands/review_next_line.py

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

src/fenrirscreenreader/commands/commands/review_next_word.py

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

src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py

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

src/fenrirscreenreader/commands/commands/review_prev_char.py

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

src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py

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

src/fenrirscreenreader/commands/commands/review_prev_line.py

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

src/fenrirscreenreader/commands/commands/review_prev_word.py

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

src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py

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