diff --git a/.gitmodules b/.gitmodules
index 06628db..95b778a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "libs/cubical-demo"]
-	path = libs/cubical-demo
-	url = git@github.com:Saizan/cubical-demo.git
+[submodule "libs/cubical"]
+	path = libs/cubical
+	url = git@github.com:fredefox/cubical.git
+[submodule "libs/agda-stdlib"]
+	path = libs/agda-stdlib
+	url = git@github.com:agda/agda-stdlib.git
diff --git a/cat.agda-lib b/cat.agda-lib
index 1b73d48..408b054 100644
--- a/cat.agda-lib
+++ b/cat.agda-lib
@@ -4,4 +4,5 @@ name: cat
 depend:
   standard-library
   cubical
-include: src
+include:
+  src
diff --git a/libraries b/libraries
deleted file mode 100644
index 1813ad5..0000000
--- a/libraries
+++ /dev/null
@@ -1 +0,0 @@
-libs/cubical-demo
diff --git a/libs/agda-stdlib b/libs/agda-stdlib
new file mode 160000
index 0000000..2033814
--- /dev/null
+++ b/libs/agda-stdlib
@@ -0,0 +1 @@
+Subproject commit 2033814d1f118401a37484390fdb5b75b83e6bb4
diff --git a/libs/cubical b/libs/cubical
new file mode 160000
index 0000000..19990b0
--- /dev/null
+++ b/libs/cubical
@@ -0,0 +1 @@
+Subproject commit 19990b03b95f76210362a6e55b94181a5481f158
diff --git a/libs/cubical-demo b/libs/cubical-demo
deleted file mode 160000
index e46610e..0000000
--- a/libs/cubical-demo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e46610eda0bbdebb072a70b947742f765a335b01