diff --git a/core/scraping/scrapers/rutracker.py b/core/data/scrapers/rutracker.py
similarity index 100%
rename from core/scraping/scrapers/rutracker.py
rename to core/data/scrapers/rutracker.py
diff --git a/core/scraping/scrapers/uztracker.py b/core/data/scrapers/uztracker.py
similarity index 100%
rename from core/scraping/scrapers/uztracker.py
rename to core/data/scrapers/uztracker.py
diff --git a/core/scraping/utils.py b/core/data/utils.py
similarity index 100%
rename from core/scraping/utils.py
rename to core/data/utils.py
diff --git a/core/ui/assets/settings.png b/core/interface/assets/settings.png
similarity index 100%
rename from core/ui/assets/settings.png
rename to core/interface/assets/settings.png
diff --git a/core/ui/assets/settings_dark.png b/core/interface/assets/settings_dark.png
similarity index 100%
rename from core/ui/assets/settings_dark.png
rename to core/interface/assets/settings_dark.png
diff --git a/core/ui/gui.py b/core/interface/gui.py
similarity index 94%
rename from core/ui/gui.py
rename to core/interface/gui.py
index 07ab164..4a40301 100644
--- a/core/ui/gui.py
+++ b/core/interface/gui.py
@@ -18,12 +18,12 @@ from PySide6.QtWidgets import (
 from PySide6.QtGui import QIcon, QAction
 import darkdetect
 import threading
-from core.scraping.scrapers.uztracker import scrape_uztracker
-from core.scraping.scrapers.rutracker import scrape_rutracker
-from core.scraping.utils import get_magnet_link
-from core.downloading.download import start_client
-from core.downloading.download import add_magnet
-from core.downloading.aria2p_server import dlprogress, set_threads
+from core.data.scrapers.uztracker import scrape_uztracker
+from core.data.scrapers.rutracker import scrape_rutracker
+from core.data.utils import get_magnet_link
+from core.network.aria2_wrapper import start_client
+from core.network.aria2_wrapper import add_magnet
+from core.network.aria2_integration import dlprogress, set_threads
 
 
 
@@ -68,7 +68,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.searchbar.setPlaceholderText("Search for software...")
         self.searchbar.setClearButtonEnabled(True)
         self.searchbar.setMinimumHeight(30)
-        self.searchbar.returnPressed.connect(lambda: self.run_thread(threading.Thread(target=self.return_pressed))) # Triggers scraping function thread on enter
+        self.searchbar.returnPressed.connect(lambda: self.run_thread(threading.Thread(target=self.return_pressed))) # Triggers data function thread on enter
         
         self.dlbutton = QtWidgets.QPushButton("Download")
         self.softwareList = QListWidget()
@@ -226,7 +226,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         item = self.softwareList.currentItem()
         if item is not None:
             if debug:
-                print(f"Downloading {self.softwareList.currentItem().text()}")
+                print(f"network {self.softwareList.currentItem().text()}")
             self.run_thread(threading.Thread(target=self.get_item_index, args=(self.softwareList.currentItem().text(), self.postnames, self.postlinks, debug)))
         else:
             if debug:
diff --git a/core/downloading/aria2p_server.py b/core/network/aria2_integration.py
similarity index 100%
rename from core/downloading/aria2p_server.py
rename to core/network/aria2_integration.py
diff --git a/core/downloading/download.py b/core/network/aria2_wrapper.py
similarity index 77%
rename from core/downloading/download.py
rename to core/network/aria2_wrapper.py
index e6e2d4b..ff9747b 100644
--- a/core/downloading/download.py
+++ b/core/network/aria2_wrapper.py
@@ -1,4 +1,4 @@
-from .aria2p_server import run_aria2p
+from .aria2_integration import run_aria2p
 
 def start_client():
     global aria2
diff --git a/main.py b/main.py
index 16cf9a7..076b365 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,7 @@
-from core.ui.gui import MainWindow
-from core.ui.gui import state_debug
-from core.ui.gui import pass_aria
-from core.downloading.aria2p_server import aria2server
+from core.interface.gui import MainWindow
+from core.interface.gui import state_debug
+from core.interface.gui import pass_aria
+from core.network.aria2_integration import aria2server
 from PySide6 import QtWidgets
 import qdarktheme
 import darkdetect