diff --git a/02-functions/.gitkeep b/02-functions/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/03-utility-routines/.gitkeep b/03-utility-routines/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/02-user-defined-functions/FactorialByReference.m b/04-user-defined-functions/FactorialByReference.m
similarity index 100%
rename from 02-user-defined-functions/FactorialByReference.m
rename to 04-user-defined-functions/FactorialByReference.m
diff --git a/02-user-defined-functions/FactorialByValue.m b/04-user-defined-functions/FactorialByValue.m
similarity index 100%
rename from 02-user-defined-functions/FactorialByValue.m
rename to 04-user-defined-functions/FactorialByValue.m
diff --git a/02-user-defined-functions/Fibonacci.m b/04-user-defined-functions/Fibonacci.m
similarity index 100%
rename from 02-user-defined-functions/Fibonacci.m
rename to 04-user-defined-functions/Fibonacci.m
diff --git a/03-user-defined-routines/Main.m b/05-user-defined-routines/Main.m
similarity index 100%
rename from 03-user-defined-routines/Main.m
rename to 05-user-defined-routines/Main.m
diff --git a/03-user-defined-routines/MyMathRoutines.m b/05-user-defined-routines/MyMathRoutines.m
similarity index 100%
rename from 03-user-defined-routines/MyMathRoutines.m
rename to 05-user-defined-routines/MyMathRoutines.m
diff --git a/04-databases/GenealogicalTree.m b/06-databases/GenealogicalTree.m
similarity index 100%
rename from 04-databases/GenealogicalTree.m
rename to 06-databases/GenealogicalTree.m
diff --git a/04-databases/basic-sql-blog/Main.m b/06-databases/basic-sql-blog/Main.m
similarity index 100%
rename from 04-databases/basic-sql-blog/Main.m
rename to 06-databases/basic-sql-blog/Main.m
diff --git a/04-databases/basic-sql-blog/routines/Category.m b/06-databases/basic-sql-blog/routines/Category.m
similarity index 100%
rename from 04-databases/basic-sql-blog/routines/Category.m
rename to 06-databases/basic-sql-blog/routines/Category.m
diff --git a/04-databases/basic-sql-blog/routines/Comment.m b/06-databases/basic-sql-blog/routines/Comment.m
similarity index 100%
rename from 04-databases/basic-sql-blog/routines/Comment.m
rename to 06-databases/basic-sql-blog/routines/Comment.m
diff --git a/04-databases/basic-sql-blog/routines/Database.m b/06-databases/basic-sql-blog/routines/Database.m
similarity index 100%
rename from 04-databases/basic-sql-blog/routines/Database.m
rename to 06-databases/basic-sql-blog/routines/Database.m
diff --git a/04-databases/basic-sql-blog/routines/Post.m b/06-databases/basic-sql-blog/routines/Post.m
similarity index 100%
rename from 04-databases/basic-sql-blog/routines/Post.m
rename to 06-databases/basic-sql-blog/routines/Post.m
diff --git a/04-databases/basic-sql-blog/routines/User.m b/06-databases/basic-sql-blog/routines/User.m
similarity index 100%
rename from 04-databases/basic-sql-blog/routines/User.m
rename to 06-databases/basic-sql-blog/routines/User.m
diff --git a/04-databases/basic-sql-crud/Main.m b/06-databases/basic-sql-crud/Main.m
similarity index 100%
rename from 04-databases/basic-sql-crud/Main.m
rename to 06-databases/basic-sql-crud/Main.m
diff --git a/04-databases/basic-sql-crud/routines/Database.m b/06-databases/basic-sql-crud/routines/Database.m
similarity index 100%
rename from 04-databases/basic-sql-crud/routines/Database.m
rename to 06-databases/basic-sql-crud/routines/Database.m
diff --git a/04-databases/basic-sql-crud/routines/User.m b/06-databases/basic-sql-crud/routines/User.m
similarity index 100%
rename from 04-databases/basic-sql-crud/routines/User.m
rename to 06-databases/basic-sql-crud/routines/User.m
diff --git a/README.md b/README.md
index 365e0cd..f737a5b 100644
--- a/README.md
+++ b/README.md
@@ -58,11 +58,11 @@ To uninstall GT.M:
 
 Copy the example of your choice into `$gtmdir/$gtmver/r`:
 
-    cp -r <your-folder>/mumps-examples/04-databases/basic-sql-blog/* $gtmdir/$gtmver/r
+    cp -r <your-folder>/mumps-examples/06-databases/basic-sql-blog/* $gtmdir/$gtmver/r
 
 Or alternatively create a symbolic link:
 
-    ln -s <your-folder>/mumps-examples/04-databases/basic-sql-blog/*  ~/.fis-gtm/V6.3-003A_x86_64/r
+    ln -s <your-folder>/mumps-examples/06-databases/basic-sql-blog/*  ~/.fis-gtm/V6.3-003A_x86_64/r
 
 Then run the example:
 
@@ -155,26 +155,34 @@ Then run the example:
 
 > The output obtained is the same as that in [`Arrays.m`](https://github.com/programarivm/mumps-examples/blob/master/01-the-very-basics/Arrays.m)
 
-## 2. User Defined Functions
+## 2. Functions
 
-### [`FactorialByReference.m`](https://github.com/programarivm/mumps-examples/blob/master/02-user-defined-functions/FactorialByReference.m)
+> TODO.
+
+## 3. Utility Routines
+
+> TODO.
+
+## 4. User Defined Functions
+
+### [`FactorialByReference.m`](https://github.com/programarivm/mumps-examples/blob/master/04-user-defined-functions/FactorialByReference.m)
 
     Enter n: 5
     5! = 120
 
-### [`FactorialByValue.m`](https://github.com/programarivm/mumps-examples/blob/master/02-user-defined-functions/FactorialByValue.m)
+### [`FactorialByValue.m`](https://github.com/programarivm/mumps-examples/blob/master/04-user-defined-functions/FactorialByValue.m)
 
     Enter n: 5
     5! = 120
 
-### [`Fibonacci.m`](https://github.com/programarivm/mumps-examples/blob/master/02-user-defined-functions/Fibonacci.m)
+### [`Fibonacci.m`](https://github.com/programarivm/mumps-examples/blob/master/04-user-defined-functions/Fibonacci.m)
 
     Enter n: 9
     F(9) = 34
 
-## 3. User Defined Routines
+## 5. User Defined Routines
 
-### [`Main.m`](https://github.com/programarivm/mumps-examples/blob/master/03-user-defined-routines/Main.m)
+### [`Main.m`](https://github.com/programarivm/mumps-examples/blob/master/05-user-defined-routines/Main.m)
 
     Hello!
     Enter n: 9
@@ -184,11 +192,11 @@ Then run the example:
     factorialByVal(9) = 362880
     factorialByRef(9) = 362880
 
-> For further details also visit [MyMathRoutines.m](https://github.com/programarivm/mumps-examples/blob/master/03-user-defined-routines/MyMathRoutines.m)
+> For further details also visit [MyMathRoutines.m](https://github.com/programarivm/mumps-examples/blob/master/05-user-defined-routines/MyMathRoutines.m)
 
-## 4. Databases
+## 6. Databases
 
-### [`GenealogicalTree.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/GenealogicalTree.m)
+### [`GenealogicalTree.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/GenealogicalTree.m)
 
     Genealogical tree:
     ^gtree(0,1,1) is Jessica
@@ -203,7 +211,7 @@ Then run the example:
     $data(^gtree(0,0,0,0,0)) is 0
     $data(^gtree(0)) is 0
 
-### [`basic-sql-crud/Main.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-crud/Main.m)
+### [`basic-sql-crud/Main.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-crud/Main.m)
 
     User successfully created!
     User successfully created!
@@ -231,10 +239,10 @@ Then run the example:
 
 For further details also visit:
 
-- [`Database.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-crud/routines/Database.m)
-- [`User.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-crud/routines/User.m)
+- [`Database.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-crud/routines/Database.m)
+- [`User.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-crud/routines/User.m)
 
-### [`basic-sql-blog/Main.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-blog/Main.m)
+### [`basic-sql-blog/Main.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-blog/Main.m)
 
     Category fetched (3):
     description: Foobar
@@ -259,11 +267,11 @@ For further details also visit:
 
 For further details also visit:
 
-- [`Category.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-blog/routines/Category.m)
-- [`Comment.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-blog/routines/Comment.m)
-- [`Database.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-blog/routines/Database.m)
-- [`Post.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-blog/routines/Post.m)
-- [`User.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-sql-blog/routines/User.m)
+- [`Category.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-blog/routines/Category.m)
+- [`Comment.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-blog/routines/Comment.m)
+- [`Database.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-blog/routines/Database.m)
+- [`Post.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-blog/routines/Post.m)
+- [`User.m`](https://github.com/programarivm/mumps-examples/blob/master/06-databases/basic-sql-blog/routines/User.m)
 
 ---