diff --git a/.gitmodules b/.gitmodules
index 68ac7c00..6502abbe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "infrared"]
-	path = infrared
+[submodule "Flipper-IRDB"]
+	path = Flipper-IRDB
 	url = https://github.com/logickworkshop/Flipper-IRDB.git
-[submodule "UberGuidoZ_playground"]
-	path = UberGuidoZ_playground
+[submodule "Flipper"]
+	path = Flipper
 	url = https://github.com/UberGuidoZ/Flipper.git
diff --git a/Flipper b/Flipper
new file mode 160000
index 00000000..78df1679
--- /dev/null
+++ b/Flipper
@@ -0,0 +1 @@
+Subproject commit 78df167901a4fa58c3cb08fef19ae65230a20659
diff --git a/Flipper-IRDB b/Flipper-IRDB
new file mode 160000
index 00000000..53917768
--- /dev/null
+++ b/Flipper-IRDB
@@ -0,0 +1 @@
+Subproject commit 53917768a85730477fc5329e1a5ea8eadf2750f2