diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9b2da51..11c64eb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,10 @@
   "yaml.schemas": {
     "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json#/$defs/playbook": [
       "file:///e%3A/Projects/AnsibleTest/setup.yml",
-      "file:///e%3A/Projects/AnsibleTest/update.yml"
-    ]
+      "file:///e%3A/Projects/AnsibleTest/update.yml",
+      "file:///e%3A/Projects/ansible-playbooks/roles/tasks/update.yml",
+      "file:///e%3A/Projects/ansible-playbooks/roles/tasks/setup.yml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/requirements.json": "file:///e%3A/Projects/ansible-playbooks/requirements.yml"
   }
 }
diff --git a/ansible.cfg b/ansible.cfg
index 1f82b59..8495b92 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,3 +1,3 @@
 [defaults]
-inventory = inventory
+inventory = inventory/hosts
 private_key_file = ~/.ssh/id_rsa
\ No newline at end of file
diff --git a/inventory/group_vars/debian.yml b/inventory/group_vars/debian.yml
new file mode 100644
index 0000000..a7d4a89
--- /dev/null
+++ b/inventory/group_vars/debian.yml
@@ -0,0 +1 @@
+# Debian-specific variables go here
diff --git a/inventory/group_vars/openwrt.yml b/inventory/group_vars/openwrt.yml
new file mode 100644
index 0000000..3e28929
--- /dev/null
+++ b/inventory/group_vars/openwrt.yml
@@ -0,0 +1 @@
+# OpenWRT-specific variables go here
diff --git a/inventory/host_vars/10.0.10.1.yml b/inventory/host_vars/10.0.10.1.yml
new file mode 100644
index 0000000..b34f540
--- /dev/null
+++ b/inventory/host_vars/10.0.10.1.yml
@@ -0,0 +1 @@
+# ARMv7 OpenWRT-specific variables for LeRouter-1 go here
diff --git a/inventory b/inventory/hosts
similarity index 100%
rename from inventory
rename to inventory/hosts
diff --git a/setup.yml b/roles/tasks/debian/setup.yml
similarity index 79%
rename from setup.yml
rename to roles/tasks/debian/setup.yml
index 8cf8240..0f29358 100644
--- a/setup.yml
+++ b/roles/tasks/debian/setup.yml
@@ -1,23 +1,21 @@
 ---
 - hosts:
     - debian
-    - ubuntu
   # Runs on root user already
   become: false
   tasks:
-    - name: Add SSH key to authorized_hosts - Debian/Ubuntu
+    - name: Add SSH key to authorized_hosts - Debian
       authorized_key:
         user: root
         state: present
         key: "{{ lookup('file', '~/.ssh/id_rsa.pub') }}"
         path: /root/.ssh/authorized_keys
-      when: ansible_distribution in ["Debian", "Ubuntu"]
     - name: Update all packages
       apt:
         update_cache: true
         autoremove: true
         state: latest
-    - name: Install packages - Debian/Ubuntu
+    - name: Install packages - Debian
       apt:
         name:
           - vim
@@ -38,6 +36,5 @@
         update_cache: false
         autoremove: true
         state: latest
-      when: ansible_distribution in ["Debian", "Ubuntu"]
     - name: Install ACME
       command: curl https://get.acme.sh | sh -s email=noehbernasol0@gmail.com
diff --git a/update.yml b/roles/tasks/debian/update.yml
similarity index 69%
rename from update.yml
rename to roles/tasks/debian/update.yml
index 3001417..4223aad 100644
--- a/update.yml
+++ b/roles/tasks/debian/update.yml
@@ -1,7 +1,6 @@
 ---
 - hosts:
     - debian
-    - ubuntu
   # Runs on root user already
   become: false
   tasks:
@@ -10,7 +9,6 @@
         update_cache: true
         autoremove: true
         state: latest
-      when: ansible_distribution in ["Debian", "Ubuntu"]
+      when: ansible_distribution in ["Debian"]
     - name: Update ACME
       command: /root/.acme.sh/acme.sh --upgrade --auto-upgrade
-      when: ansible_distribution in ["Debian", "Ubuntu"]