diff --git a/bootstrap.bash b/bootstrap.bash
index a092eff..503edea 100644
--- a/bootstrap.bash
+++ b/bootstrap.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-bash system-ubuntu.bash
+bash os.bash
 bash tools.bash
 bash fonts.bash
 bash config.bash
diff --git a/os.bash b/os.bash
new file mode 100644
index 0000000..a3e4265
--- /dev/null
+++ b/os.bash
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for file in os.d/*.bash; do
+  bash $file
+done
diff --git a/system-ubuntu.bash b/os.d/ubuntu.bash
similarity index 88%
rename from system-ubuntu.bash
rename to os.d/ubuntu.bash
index dd0019b..561126f 100644
--- a/system-ubuntu.bash
+++ b/os.d/ubuntu.bash
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-if ( grep -q Ubuntu <(lsb_release -i) )
-then
+if (grep -q Ubuntu <(lsb_release -i)); then
     sudo apt update
     sudo apt upgrade -y
-    
+
     sudo apt install -y coreutils grep less tar tree
     sudo apt install -y man manpages-fr manpages-fr-extra
     sudo apt install -y bash zsh fish