diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..17b6bd80
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,15 @@
+{
+  "name": "System76 Open Firmware",
+  "build": {
+    "dockerfile": "../tools/containers/firmware-open/Containerfile"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      "extensions": [
+        "EditorConfig.EditorConfig",
+        "rust-lang.rust-analyzer"
+      ]
+    }
+  }
+}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..b44ea1b6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: NONE
+
+# EditorConfig: https://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+indent_size = 2
+
+[{Makefile,*.mk}]
+indent_style = tab
+
+[*.{json,yaml,yml}]
+indent_size = 2
diff --git a/docs/flashing.md b/docs/flashing.md
index 24762ce5..ad4d0e57 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -68,7 +68,7 @@ These can be purchased from many places for around 15 USD. Make sure that the
 one you get has a ROM clip. Here are some examples:
 
 - [Amazon.com, Organizer.](https://www.amazon.com/Organizer-Socket-Adpter-Programmer-CH341A/dp/B07R5LPTYM)
-- [Amazon.com, KeeYees.](https://www.amazon.com/KeeYees-SOIC8-EEPROM-CH341A-Programmer/dp/B07SHSL9X9) 
+- [Amazon.com, KeeYees.](https://www.amazon.com/KeeYees-SOIC8-EEPROM-CH341A-Programmer/dp/B07SHSL9X9)
 - [AliExpress.com, TZT.](https://aliexpress.com/item/32725360255.html)
 
 **Then you can follow these steps to flash the ROM chip:**
diff --git a/containers/Makefile b/tools/containers/Makefile
similarity index 100%
rename from containers/Makefile
rename to tools/containers/Makefile
diff --git a/containers/firmware-open/Containerfile b/tools/containers/firmware-open/Containerfile
similarity index 100%
rename from containers/firmware-open/Containerfile
rename to tools/containers/firmware-open/Containerfile