diff --git a/.gitmodules b/.gitmodules
index 56e371e5a..9aa55c132 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,36 +9,36 @@
 [submodule "psp"]
 	path = psp
 	url = https://github.com/nasa/PSP.git
-        branch = master
+  branch = main
 [submodule "apps/ci_lab"]
 	path = apps/ci_lab
 	url = https://github.com/nasa/ci_lab.git
-        branch = master
+  branch = main
 [submodule "apps/sample_app"]
 	path = apps/sample_app
 	url = https://github.com/nasa/sample_app.git
-        branch = master
+	branch = main
 [submodule "apps/sample_lib"]
-	path = apps/sample_lib
+	path = libs/sample_lib
 	url = https://github.com/nasa/sample_lib.git
-        branch = master
+  branch = main
 [submodule "apps/sch_lab"]
 	path = apps/sch_lab
 	url = https://github.com/nasa/sch_lab.git
-        branch = master
+  branch = main
 [submodule "apps/to_lab"]
 	path = apps/to_lab
 	url = https://github.com/nasa/to_lab.git
-        branch = master
+  branch = main
 [submodule "tools/cFS-GroundSystem"]
 	path = tools/cFS-GroundSystem
 	url = https://github.com/nasa/cFS-GroundSystem.git
-        branch = master
+  branch = main
 [submodule "tools/elf2cfetbl"]
 	path = tools/elf2cfetbl
 	url = https://github.com/nasa/elf2cfetbl.git
-        branch = master
+  branch = main
 [submodule "tools/tblCRCTool"]
 	path = tools/tblCRCTool
 	url = https://github.com/nasa/tblCRCTool.git
-        branch = master
+  branch = main
diff --git a/cfe b/cfe
index eb9c52319..a0c2de629 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit eb9c52319fb1f31f72159551735ad5f1365e5a79
+Subproject commit a0c2de62934e61a93bb4282c0fc784cf4be50da9
diff --git a/apps/sample_lib b/libs/sample_lib
similarity index 100%
rename from apps/sample_lib
rename to libs/sample_lib