diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..3a8af9fd
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,39 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceRoot}/tools/demo.py",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "type": "gdb",
+            "request": "attach",
+            "name": "Launch Program",
+            "target": "localhost:3333",
+            "gdbpath": "arm-none-eabi-gdb",
+            "remote": true,
+            "executable": "./build/ODriveFirmware.elf",
+            "cwd": "${workspaceRoot}/Firmware",
+            "printCalls": false,
+            //"preLaunchTask": "openocd",  // This isn't working quite right.
+            "autorun": [
+                "monitor reset halt"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..4901eb75
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,35 @@
+{
+    "C_Cpp.clang_format_style": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0 }",
+    "files.associations": {
+        "memory": "cpp",
+        "utility": "cpp",
+        "deque": "cpp",
+        "vector": "cpp",
+        "array": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "exception": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "algorithm": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/Firmware/.vscode/tasks.json b/.vscode/tasks.json
similarity index 89%
rename from Firmware/.vscode/tasks.json
rename to .vscode/tasks.json
index 697bfec2..6917fa11 100644
--- a/Firmware/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -6,7 +6,7 @@
         {
             "taskName": "build",
             "type": "shell",
-            "command": "make -j4",
+            "command": "(cd Firmware && make -j4)",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -21,7 +21,7 @@
         {
             "taskName": "flash",
             "type": "shell",
-            "command": "make flash",
+            "command": "(cd Firmware && make flash)",
             "problemMatcher": []
         },
         {
diff --git a/Firmware/.vscode/launch.json b/Firmware/.vscode/launch.json
deleted file mode 100644
index 5dbef258..00000000
--- a/Firmware/.vscode/launch.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "gdb",
-            "request": "attach",
-            "name": "Launch Program",
-            "target": "localhost:3333",
-            "gdbpath": "arm-none-eabi-gdb",
-            "remote": true,
-            "executable": "./build/ODriveFirmware.elf",
-            "cwd": "${workspaceRoot}",
-            "printCalls": false,
-            //"preLaunchTask": "openocd",  // This isn't working quite right.
-            "autorun": [
-                "monitor reset halt"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Firmware/.vscode/settings.json b/Firmware/.vscode/settings.json
deleted file mode 100644
index 3c85c084..00000000
--- a/Firmware/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "C_Cpp.clang_format_style": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0 }"
-}
\ No newline at end of file