diff --git a/home/users/odweta/comms.nix b/home/users/odweta/comms.nix
new file mode 100644
index 0000000..7ba4aca
--- /dev/null
+++ b/home/users/odweta/comms.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  # Install apps as user packages
+  home.packages = with pkgs; [
+    element-desktop    # Matrix client
+    signal-desktop     # Signal client
+    discord           # Discord client
+  ];
+}
diff --git a/home/users/odweta/default.nix b/home/users/odweta/default.nix
index fa1f656..35fb4c8 100644
--- a/home/users/odweta/default.nix
+++ b/home/users/odweta/default.nix
@@ -8,11 +8,14 @@
 
   imports = [
     ./bash.nix
+    ./comms.nix
     ./fastfetch.nix
     ./git.nix
     ./gnome.nix
     ./keepass.nix
     ./minecraft.nix
+    ./ssh.nix
+    ./syncthing.nix
     ./vim.nix
     ./xdg.nix
     ./xournalpp.nix
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
new file mode 100644
index 0000000..1a89f07
--- /dev/null
+++ b/modules/apps/default.nix
@@ -0,0 +1,6 @@
+[
+  ./qbittirrent.nix
+  ./steam.nix
+  ./ungoogled-chromium.nix
+  ./wine.nix
+]
diff --git a/modules/core/default.nix b/modules/core/default.nix
new file mode 100644
index 0000000..9b1ce95
--- /dev/null
+++ b/modules/core/default.nix
@@ -0,0 +1,8 @@
+[
+  ./boot.nix
+  ./env-vars.nix
+  ./nix-settings.nix
+  ./security.nix
+  ./time.nix
+  ./users.nix
+]
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..09a3866
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,4 @@
+[
+  ./fonts.nix
+  ./gnome.nix
+]
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
new file mode 100644
index 0000000..f3b9e87
--- /dev/null
+++ b/modules/hardware/default.nix
@@ -0,0 +1,5 @@
+[
+  ./audio.nix
+  ./opengl.nix
+  ./usb.nix
+]
diff --git a/modules/services/default.nix b/modules/services/default.nix
new file mode 100644
index 0000000..5ff8a4b
--- /dev/null
+++ b/modules/services/default.nix
@@ -0,0 +1,5 @@
+[
+  ./networking.nix
+  ./openssh.nix
+  ./printing.nix
+]