diff --git a/Software/ChainLube/.gitignore b/Software/.gitignore
similarity index 100%
rename from Software/ChainLube/.gitignore
rename to Software/.gitignore
diff --git a/Software/ChainLube/.vscode/extensions.json b/Software/.vscode/extensions.json
similarity index 100%
rename from Software/ChainLube/.vscode/extensions.json
rename to Software/.vscode/extensions.json
diff --git a/Software/ChainLube/assets/Logo.svg b/Software/assets/Logo.svg
similarity index 100%
rename from Software/ChainLube/assets/Logo.svg
rename to Software/assets/Logo.svg
diff --git a/Software/ChainLube/data/index.htm b/Software/data/index.htm
similarity index 100%
rename from Software/ChainLube/data/index.htm
rename to Software/data/index.htm
diff --git a/Software/ChainLube/data/post.htm b/Software/data/post.htm
similarity index 100%
rename from Software/ChainLube/data/post.htm
rename to Software/data/post.htm
diff --git a/Software/ChainLube/data/static/css/bootstrap.min.css b/Software/data/static/css/bootstrap.min.css
similarity index 100%
rename from Software/ChainLube/data/static/css/bootstrap.min.css
rename to Software/data/static/css/bootstrap.min.css
diff --git a/Software/ChainLube/data/static/css/custom.css b/Software/data/static/css/custom.css
similarity index 100%
rename from Software/ChainLube/data/static/css/custom.css
rename to Software/data/static/css/custom.css
diff --git a/Software/ChainLube/data/static/img/android-chrome-192x192.png b/Software/data/static/img/android-chrome-192x192.png
similarity index 100%
rename from Software/ChainLube/data/static/img/android-chrome-192x192.png
rename to Software/data/static/img/android-chrome-192x192.png
diff --git a/Software/ChainLube/data/static/img/android-chrome-512x512.png b/Software/data/static/img/android-chrome-512x512.png
similarity index 100%
rename from Software/ChainLube/data/static/img/android-chrome-512x512.png
rename to Software/data/static/img/android-chrome-512x512.png
diff --git a/Software/ChainLube/data/static/img/apple-touch-icon.png b/Software/data/static/img/apple-touch-icon.png
similarity index 100%
rename from Software/ChainLube/data/static/img/apple-touch-icon.png
rename to Software/data/static/img/apple-touch-icon.png
diff --git a/Software/ChainLube/data/static/img/favicon-16x16.png b/Software/data/static/img/favicon-16x16.png
similarity index 100%
rename from Software/ChainLube/data/static/img/favicon-16x16.png
rename to Software/data/static/img/favicon-16x16.png
diff --git a/Software/ChainLube/data/static/img/favicon-32x32.png b/Software/data/static/img/favicon-32x32.png
similarity index 100%
rename from Software/ChainLube/data/static/img/favicon-32x32.png
rename to Software/data/static/img/favicon-32x32.png
diff --git a/Software/ChainLube/data/static/img/favicon.ico b/Software/data/static/img/favicon.ico
similarity index 100%
rename from Software/ChainLube/data/static/img/favicon.ico
rename to Software/data/static/img/favicon.ico
diff --git a/Software/ChainLube/data/static/img/logo.png b/Software/data/static/img/logo.png
similarity index 100%
rename from Software/ChainLube/data/static/img/logo.png
rename to Software/data/static/img/logo.png
diff --git a/Software/ChainLube/data/static/img/site.webmanifest b/Software/data/static/img/site.webmanifest
similarity index 100%
rename from Software/ChainLube/data/static/img/site.webmanifest
rename to Software/data/static/img/site.webmanifest
diff --git a/Software/ChainLube/data/static/js/bootstrap.min.js b/Software/data/static/js/bootstrap.min.js
similarity index 100%
rename from Software/ChainLube/data/static/js/bootstrap.min.js
rename to Software/data/static/js/bootstrap.min.js
diff --git a/Software/ChainLube/data/static/js/jquery.min.js b/Software/data/static/js/jquery.min.js
similarity index 100%
rename from Software/ChainLube/data/static/js/jquery.min.js
rename to Software/data/static/js/jquery.min.js
diff --git a/Software/ChainLube/git_rev_macro.py b/Software/git_rev_macro.py
similarity index 100%
rename from Software/ChainLube/git_rev_macro.py
rename to Software/git_rev_macro.py
diff --git a/Software/ChainLube/include/README b/Software/include/README
similarity index 100%
rename from Software/ChainLube/include/README
rename to Software/include/README
diff --git a/Software/ChainLube/lib/README b/Software/lib/README
similarity index 100%
rename from Software/ChainLube/lib/README
rename to Software/lib/README
diff --git a/Software/ChainLube/platformio.ini b/Software/platformio.ini
similarity index 100%
rename from Software/ChainLube/platformio.ini
rename to Software/platformio.ini
diff --git a/Software/ChainLube/src/can.cpp b/Software/src/can.cpp
similarity index 100%
rename from Software/ChainLube/src/can.cpp
rename to Software/src/can.cpp
diff --git a/Software/ChainLube/src/can.h b/Software/src/can.h
similarity index 100%
rename from Software/ChainLube/src/can.h
rename to Software/src/can.h
diff --git a/Software/ChainLube/src/common.h b/Software/src/common.h
similarity index 100%
rename from Software/ChainLube/src/common.h
rename to Software/src/common.h
diff --git a/Software/ChainLube/src/config.cpp b/Software/src/config.cpp
similarity index 100%
rename from Software/ChainLube/src/config.cpp
rename to Software/src/config.cpp
diff --git a/Software/ChainLube/src/config.h b/Software/src/config.h
similarity index 100%
rename from Software/ChainLube/src/config.h
rename to Software/src/config.h
diff --git a/Software/ChainLube/src/dtc.cpp b/Software/src/dtc.cpp
similarity index 100%
rename from Software/ChainLube/src/dtc.cpp
rename to Software/src/dtc.cpp
diff --git a/Software/ChainLube/src/dtc.h b/Software/src/dtc.h
similarity index 100%
rename from Software/ChainLube/src/dtc.h
rename to Software/src/dtc.h
diff --git a/Software/ChainLube/src/globals.h b/Software/src/globals.h
similarity index 100%
rename from Software/ChainLube/src/globals.h
rename to Software/src/globals.h
diff --git a/Software/ChainLube/src/gps.cpp b/Software/src/gps.cpp
similarity index 100%
rename from Software/ChainLube/src/gps.cpp
rename to Software/src/gps.cpp
diff --git a/Software/ChainLube/src/gps.h b/Software/src/gps.h
similarity index 100%
rename from Software/ChainLube/src/gps.h
rename to Software/src/gps.h
diff --git a/Software/ChainLube/src/lubeapp.cpp b/Software/src/lubeapp.cpp
similarity index 100%
rename from Software/ChainLube/src/lubeapp.cpp
rename to Software/src/lubeapp.cpp
diff --git a/Software/ChainLube/src/lubeapp.h b/Software/src/lubeapp.h
similarity index 100%
rename from Software/ChainLube/src/lubeapp.h
rename to Software/src/lubeapp.h
diff --git a/Software/ChainLube/src/main.cpp b/Software/src/main.cpp
similarity index 100%
rename from Software/ChainLube/src/main.cpp
rename to Software/src/main.cpp
diff --git a/Software/ChainLube/src/rmtdbghelp.h b/Software/src/rmtdbghelp.h
similarity index 100%
rename from Software/ChainLube/src/rmtdbghelp.h
rename to Software/src/rmtdbghelp.h
diff --git a/Software/ChainLube/src/webui.cpp b/Software/src/webui.cpp
similarity index 100%
rename from Software/ChainLube/src/webui.cpp
rename to Software/src/webui.cpp
diff --git a/Software/ChainLube/src/webui.h b/Software/src/webui.h
similarity index 100%
rename from Software/ChainLube/src/webui.h
rename to Software/src/webui.h
diff --git a/Software/ChainLube/test/README b/Software/test/README
similarity index 100%
rename from Software/ChainLube/test/README
rename to Software/test/README
diff --git a/Software/ChainLube/wifi_credentials.example.ini b/Software/wifi_credentials.example.ini
similarity index 100%
rename from Software/ChainLube/wifi_credentials.example.ini
rename to Software/wifi_credentials.example.ini