diff --git a/.gitignore b/.gitignore
index 89cc49c..21c53ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
 .pio
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/ipch
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index e80666b..0000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ]
-}
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 1301145..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "files.associations": {
-        "array": "cpp",
-        "deque": "cpp",
-        "string": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "string_view": "cpp",
-        "initializer_list": "cpp",
-        "cstdint": "cpp"
-    }
-}
\ No newline at end of file
diff --git a/src/main.cpp b/CommandStation.cpp
similarity index 100%
rename from src/main.cpp
rename to CommandStation.cpp
diff --git a/include/Config.h b/Config.h
similarity index 92%
rename from include/Config.h
rename to Config.h
index 56ba0e7..4605be8 100644
--- a/include/Config.h
+++ b/Config.h
@@ -22,8 +22,8 @@
 
 // Choose the motor shield that you want to use.
 
-#define CONFIG_WSM_FIREBOX
-//#define CONFIG_ARDUINO_MOTOR_SHIELD
+//#define CONFIG_WSM_FIREBOX
+#define CONFIG_ARDUINO_MOTOR_SHIELD
 //#define CONFIG_POLOLU_MOTOR_SHIELD
 
-#endif
\ No newline at end of file
+#endif
diff --git a/platformio.ini b/platformio.ini
index 2fb4226..a976064 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,6 +10,7 @@
 
 [platformio]
 default_envs = samd21, mega2560, mega328
+src_dir = .
 
 [env]
 lib_deps =