diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d44e5d5..238daaf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -74,7 +74,8 @@ jobs:
       - name: Lint with flake8
         run: |
           flake8 --count --show-source --statistics --max-line-length=120 \
-          --per-file-ignores=nexus/Freqlog/backends/__init__.py:F401 --exclude=venv
+          --per-file-ignores=nexus/Freqlog/backends/__init__.py:F401 \
+          --exclude=venv,nexus/ui,resources_rc.py,nexus/keyboard,nexus/mouse
       - name: Build package
         run: python -m build
       - name: Check and install package
diff --git a/.gitmodules b/.gitmodules
index 2dd34dc..137248e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "keyboard"]
-	path = keyboard
+	path = nexus/keyboard
 	url = https://github.com/boppreh/keyboard
 [submodule "mouse"]
-	path = mouse
+	path = nexus/mouse
 	url = https://github.com/boppreh/mouse
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4472055..7972951 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -54,7 +54,7 @@ repos:
           - --statistics
           - --max-line-length=120
           - --per-file-ignores=nexus/Freqlog/backends/__init__.py:F401
-          - --exclude=venv,nexus/ui,resources_rc.py,keyboard,mouse
+          - --exclude=venv,nexus/ui,resources_rc.py,nexus/keyboard,nexus/mouse
         additional_dependencies: [flake8]
       - id: pytest
         name: pytest
diff --git a/keyboard b/keyboard
deleted file mode 160000
index d232de0..0000000
--- a/keyboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d232de09bda50ecb5211ebcc59b85bc6da6aaa24
diff --git a/mouse b/mouse
deleted file mode 160000
index 41f8cca..0000000
--- a/mouse
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 41f8ccae317e1a3fd90a73dfd8def0ed31fbd213
diff --git a/nexus/Freqlog/Freqlog.py b/nexus/Freqlog/Freqlog.py
index 0827eea..ee3e6ac 100644
--- a/nexus/Freqlog/Freqlog.py
+++ b/nexus/Freqlog/Freqlog.py
@@ -6,8 +6,8 @@
 from threading import Thread
 from typing import Optional, Callable
 
-import keyboard
-import mouse
+from ..keyboard import keyboard
+from ..mouse import mouse
 from serial import SerialException
 
 from .backends import Backend, SQLiteBackend
diff --git a/nexus/__main__.py b/nexus/__main__.py
index 964a3c2..bf902d2 100644
--- a/nexus/__main__.py
+++ b/nexus/__main__.py
@@ -5,7 +5,7 @@
 import sys
 
 from getpass import getpass
-import keyboard
+import keyboard.keyboard as keyboard
 
 from nexus import __doc__, __version__
 from nexus.Freqlog import Freqlog