diff --git a/content/code/00_hello-world/.DS_Store b/content/code/00_hello-world/.DS_Store
deleted file mode 100644
index d234416..0000000
Binary files a/content/code/00_hello-world/.DS_Store and /dev/null differ
diff --git a/content/code/01_libraries-cxx/CMakeLists.txt b/content/code/01_producing-libraries/cxx/CMakeLists.txt
similarity index 100%
rename from content/code/01_libraries-cxx/CMakeLists.txt
rename to content/code/01_producing-libraries/cxx/CMakeLists.txt
diff --git a/content/code/01_libraries-cxx/Message.cpp b/content/code/01_producing-libraries/cxx/Message.cpp
similarity index 100%
rename from content/code/01_libraries-cxx/Message.cpp
rename to content/code/01_producing-libraries/cxx/Message.cpp
diff --git a/content/code/01_libraries-cxx/Message.hpp b/content/code/01_producing-libraries/cxx/Message.hpp
similarity index 100%
rename from content/code/01_libraries-cxx/Message.hpp
rename to content/code/01_producing-libraries/cxx/Message.hpp
diff --git a/content/code/01_libraries-cxx/hello-world.cpp b/content/code/01_producing-libraries/cxx/hello-world.cpp
similarity index 62%
rename from content/code/01_libraries-cxx/hello-world.cpp
rename to content/code/01_producing-libraries/cxx/hello-world.cpp
index b13d547..d05147b 100644
--- a/content/code/01_libraries-cxx/hello-world.cpp
+++ b/content/code/01_producing-libraries/cxx/hello-world.cpp
@@ -4,11 +4,11 @@
 #include <iostream>
 
 int main() {
-  Message say_hello("Hello, CMake World!");
+  Message say_hello("Hello, CMake World from C++!");
 
   std::cout << say_hello << std::endl;
 
-  Message say_goodbye("Goodbye, CMake World");
+  Message say_goodbye("Goodbye, CMake World from C++!");
 
   std::cout << say_goodbye << std::endl;
 
diff --git a/content/code/01_libraries-cxx/solution/CMakeLists.txt b/content/code/01_producing-libraries/cxx/solution/CMakeLists.txt
similarity index 100%
rename from content/code/01_libraries-cxx/solution/CMakeLists.txt
rename to content/code/01_producing-libraries/cxx/solution/CMakeLists.txt
diff --git a/content/code/01_libraries-cxx/solution/Message.cpp b/content/code/01_producing-libraries/cxx/solution/Message.cpp
similarity index 100%
rename from content/code/01_libraries-cxx/solution/Message.cpp
rename to content/code/01_producing-libraries/cxx/solution/Message.cpp
diff --git a/content/code/01_libraries-cxx/solution/Message.hpp b/content/code/01_producing-libraries/cxx/solution/Message.hpp
similarity index 100%
rename from content/code/01_libraries-cxx/solution/Message.hpp
rename to content/code/01_producing-libraries/cxx/solution/Message.hpp
diff --git a/content/code/01_libraries-cxx/solution/hello-world.cpp b/content/code/01_producing-libraries/cxx/solution/hello-world.cpp
similarity index 62%
rename from content/code/01_libraries-cxx/solution/hello-world.cpp
rename to content/code/01_producing-libraries/cxx/solution/hello-world.cpp
index b13d547..d05147b 100644
--- a/content/code/01_libraries-cxx/solution/hello-world.cpp
+++ b/content/code/01_producing-libraries/cxx/solution/hello-world.cpp
@@ -4,11 +4,11 @@
 #include <iostream>
 
 int main() {
-  Message say_hello("Hello, CMake World!");
+  Message say_hello("Hello, CMake World from C++!");
 
   std::cout << say_hello << std::endl;
 
-  Message say_goodbye("Goodbye, CMake World");
+  Message say_goodbye("Goodbye, CMake World from C++!");
 
   std::cout << say_goodbye << std::endl;
 
diff --git a/content/code/01_libraries-f/CMakeLists.txt b/content/code/01_producing-libraries/fortran/CMakeLists.txt
similarity index 100%
rename from content/code/01_libraries-f/CMakeLists.txt
rename to content/code/01_producing-libraries/fortran/CMakeLists.txt
diff --git a/content/code/01_libraries-f/solution/hello-world.f90 b/content/code/01_producing-libraries/fortran/hello-world.f90
similarity index 61%
rename from content/code/01_libraries-f/solution/hello-world.f90
rename to content/code/01_producing-libraries/fortran/hello-world.f90
index d0642d9..d921d4e 100644
--- a/content/code/01_libraries-f/solution/hello-world.f90
+++ b/content/code/01_producing-libraries/fortran/hello-world.f90
@@ -6,10 +6,10 @@ program hello_world
 
   type(Messenger) :: hello, bye
 
-  hello%message_ = 'Hello, CMake world!'
+  hello%message_ = 'Hello, CMake world from Fortran!'
   print *, print_message(hello)
 
-  bye%message_ = 'Bye, CMake world!'
+  bye%message_ = 'Bye, CMake world from Fortran!'
   print *, print_message(bye)
 
 end program
diff --git a/content/code/01_libraries-f/message.f90 b/content/code/01_producing-libraries/fortran/message.f90
similarity index 91%
rename from content/code/01_libraries-f/message.f90
rename to content/code/01_producing-libraries/fortran/message.f90
index bd9a8c2..ddc6eb5 100644
--- a/content/code/01_libraries-f/message.f90
+++ b/content/code/01_producing-libraries/fortran/message.f90
@@ -16,7 +16,7 @@ module messaging
   pure function print_message(postman) result(m)
 
     type(Messenger), intent(in) :: postman
-    character(len=19) :: m
+    character(len=32) :: m
 
     m = postman%message_
 
diff --git a/content/code/01_producing-libraries/fortran/messaging.mod b/content/code/01_producing-libraries/fortran/messaging.mod
new file mode 100644
index 0000000..0e067db
Binary files /dev/null and b/content/code/01_producing-libraries/fortran/messaging.mod differ
diff --git a/content/code/01_libraries-f/solution/CMakeLists.txt b/content/code/01_producing-libraries/fortran/solution/CMakeLists.txt
similarity index 100%
rename from content/code/01_libraries-f/solution/CMakeLists.txt
rename to content/code/01_producing-libraries/fortran/solution/CMakeLists.txt
diff --git a/content/code/01_libraries-f/hello-world.f90 b/content/code/01_producing-libraries/fortran/solution/hello-world.f90
similarity index 61%
rename from content/code/01_libraries-f/hello-world.f90
rename to content/code/01_producing-libraries/fortran/solution/hello-world.f90
index d0642d9..d921d4e 100644
--- a/content/code/01_libraries-f/hello-world.f90
+++ b/content/code/01_producing-libraries/fortran/solution/hello-world.f90
@@ -6,10 +6,10 @@ program hello_world
 
   type(Messenger) :: hello, bye
 
-  hello%message_ = 'Hello, CMake world!'
+  hello%message_ = 'Hello, CMake world from Fortran!'
   print *, print_message(hello)
 
-  bye%message_ = 'Bye, CMake world!'
+  bye%message_ = 'Bye, CMake world from Fortran!'
   print *, print_message(bye)
 
 end program
diff --git a/content/code/01_libraries-f/solution/message.f90 b/content/code/01_producing-libraries/fortran/solution/message.f90
similarity index 81%
rename from content/code/01_libraries-f/solution/message.f90
rename to content/code/01_producing-libraries/fortran/solution/message.f90
index bd9a8c2..fca9b94 100644
--- a/content/code/01_libraries-f/solution/message.f90
+++ b/content/code/01_producing-libraries/fortran/solution/message.f90
@@ -4,7 +4,7 @@ module messaging
 
   public Messenger
   type Messenger
-    character(len=19) :: message_
+    character(len=32) :: message_
   end type
 
   public print_message
@@ -16,7 +16,7 @@ module messaging
   pure function print_message(postman) result(m)
 
     type(Messenger), intent(in) :: postman
-    character(len=19) :: m
+    character(len=32) :: m
 
     m = postman%message_
 
diff --git a/content/code/01_producing-libraries/fortran/solution/messaging.mod b/content/code/01_producing-libraries/fortran/solution/messaging.mod
new file mode 100644
index 0000000..660a3d1
Binary files /dev/null and b/content/code/01_producing-libraries/fortran/solution/messaging.mod differ