diff --git a/src/RSIPI/cli.py b/src/RSIPI/cli.py
index 497f0ee..fb52af4 100644
--- a/src/RSIPI/cli.py
+++ b/src/RSIPI/cli.py
@@ -1,13 +1,4 @@
-import sys
-import os
-import threading
-import multiprocessing
-
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
-
-from src.RSIPI.rsi_client import RSIClient
-from src.RSIPI.graphing import RSIGraphing
-
+from .rsi_client import RSIClient
 
 class RSICommandLineInterface:
     """Command-Line Interface for controlling RSI Client."""
diff --git a/src/RSIPI/config_parser.py b/src/RSIPI/config_parser.py
index 203cbd9..7fcff27 100644
--- a/src/RSIPI/config_parser.py
+++ b/src/RSIPI/config_parser.py
@@ -1,5 +1,4 @@
 import xml.etree.ElementTree as ET
-import logging
 
 class ConfigParser:
     """Handles parsing the RSI config file and generating structured send/receive variables."""
diff --git a/src/RSIPI/echo_server.py b/src/RSIPI/echo_server.py
index 747daf2..787091b 100644
--- a/src/RSIPI/echo_server.py
+++ b/src/RSIPI/echo_server.py
@@ -1,14 +1,9 @@
-import sys
-import os
 import socket
 import time
 import xml.etree.ElementTree as ET
 import logging
 import threading
-
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
-
-from src.RSIPI.rsi_config import RSIConfig
+from .rsi_config import RSIConfig
 
 # ✅ Configure Logging
 LOGGING_ENABLED = True
diff --git a/src/RSIPI/graphing.py b/src/RSIPI/graphing.py
index 3b5756c..7923565 100644
--- a/src/RSIPI/graphing.py
+++ b/src/RSIPI/graphing.py
@@ -1,10 +1,8 @@
 import time
-import pandas as pd
-import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.animation as animation
 from collections import deque
-from src.RSIPI.rsi_client import RSIClient
+from .rsi_client import RSIClient
 
 class RSIGraphing:
     """Handles real-time and CSV-based graphing for RSI analysis with alerts and threshold monitoring."""
diff --git a/src/RSIPI/main.py b/src/RSIPI/main.py
index 113dd2d..d74aaac 100644
--- a/src/RSIPI/main.py
+++ b/src/RSIPI/main.py
@@ -1,5 +1,4 @@
-from src.RSIPI.rsi_client import RSIClient
-import rsi_api
+from .rsi_client import RSIClient
 from time import sleep
 
 if __name__ == "__main__":
diff --git a/src/RSIPI/network_process.py b/src/RSIPI/network_process.py
index 6a1a0c7..ef89af4 100644
--- a/src/RSIPI/network_process.py
+++ b/src/RSIPI/network_process.py
@@ -1,11 +1,9 @@
-
 import multiprocessing
 import socket
 import time
 import csv
 import logging
 import xml.etree.ElementTree as ET  # ✅ FIX: Import ElementTree
-from .config_parser import ConfigParser
 from .xml_handler import XMLGenerator
 
 
diff --git a/src/RSIPI/test_rsipi.py b/src/RSIPI/test_rsipi.py
index a19d5b1..878e311 100644
--- a/src/RSIPI/test_rsipi.py
+++ b/src/RSIPI/test_rsipi.py
@@ -1,10 +1,6 @@
 import unittest
 from time import sleep
 from rsi_api import RSIAPI
-import os
-import sys
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
-
 
 class TestRSIPI(unittest.TestCase):