diff --git a/plugins/messageviewer/bodypartformatter/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/CMakeLists.txt
index 886b374e..2e3c8c03 100644
--- a/plugins/messageviewer/bodypartformatter/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/CMakeLists.txt
@@ -1,10 +1,10 @@
 if(BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
 add_subdirectory(ms-tnef)
 add_subdirectory(vcard)
 add_subdirectory(highlighter)
 add_subdirectory(calendar)
 add_subdirectory(gnupgwks)
 add_subdirectory(pkpass)
-add_subdirectory(semantic)
+add_subdirectory(itinerary)
diff --git a/plugins/messageviewer/bodypartformatter/semantic/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/itinerary/CMakeLists.txt
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/CMakeLists.txt
rename to plugins/messageviewer/bodypartformatter/itinerary/CMakeLists.txt
diff --git a/plugins/messageviewer/bodypartformatter/semantic/Messages.sh b/plugins/messageviewer/bodypartformatter/itinerary/Messages.sh
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/Messages.sh
rename to plugins/messageviewer/bodypartformatter/itinerary/Messages.sh
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itinerary_plugin.cpp b/plugins/messageviewer/bodypartformatter/itinerary/itinerary_plugin.cpp
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itinerary_plugin.cpp
rename to plugins/messageviewer/bodypartformatter/itinerary/itinerary_plugin.cpp
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itinerary_plugin.json b/plugins/messageviewer/bodypartformatter/itinerary/itinerary_plugin.json
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itinerary_plugin.json
rename to plugins/messageviewer/bodypartformatter/itinerary/itinerary_plugin.json
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itinerarymemento.cpp b/plugins/messageviewer/bodypartformatter/itinerary/itinerarymemento.cpp
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itinerarymemento.cpp
rename to plugins/messageviewer/bodypartformatter/itinerary/itinerarymemento.cpp
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itinerarymemento.h b/plugins/messageviewer/bodypartformatter/itinerary/itinerarymemento.h
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itinerarymemento.h
rename to plugins/messageviewer/bodypartformatter/itinerary/itinerarymemento.h
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itineraryprocessor.cpp b/plugins/messageviewer/bodypartformatter/itinerary/itineraryprocessor.cpp
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itineraryprocessor.cpp
rename to plugins/messageviewer/bodypartformatter/itinerary/itineraryprocessor.cpp
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itineraryprocessor.h b/plugins/messageviewer/bodypartformatter/itinerary/itineraryprocessor.h
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itineraryprocessor.h
rename to plugins/messageviewer/bodypartformatter/itinerary/itineraryprocessor.h
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itineraryrenderer.cpp b/plugins/messageviewer/bodypartformatter/itinerary/itineraryrenderer.cpp
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itineraryrenderer.cpp
rename to plugins/messageviewer/bodypartformatter/itinerary/itineraryrenderer.cpp
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itineraryrenderer.h b/plugins/messageviewer/bodypartformatter/itinerary/itineraryrenderer.h
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itineraryrenderer.h
rename to plugins/messageviewer/bodypartformatter/itinerary/itineraryrenderer.h
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itineraryurlhandler.cpp b/plugins/messageviewer/bodypartformatter/itinerary/itineraryurlhandler.cpp
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itineraryurlhandler.cpp
rename to plugins/messageviewer/bodypartformatter/itinerary/itineraryurlhandler.cpp
diff --git a/plugins/messageviewer/bodypartformatter/semantic/itineraryurlhandler.h b/plugins/messageviewer/bodypartformatter/itinerary/itineraryurlhandler.h
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/itineraryurlhandler.h
rename to plugins/messageviewer/bodypartformatter/itinerary/itineraryurlhandler.h
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates.qrc b/plugins/messageviewer/bodypartformatter/itinerary/templates.qrc
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates.qrc
rename to plugins/messageviewer/bodypartformatter/itinerary/templates.qrc
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/actions.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/actions.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/actions.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/actions.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/busreservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/busreservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/busreservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/busreservation.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/event.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/event.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/event.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/event.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/flightreservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/flightreservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/flightreservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/flightreservation.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/foodestablishmentreservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/foodestablishmentreservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/foodestablishmentreservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/foodestablishmentreservation.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/lodgingreservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/lodgingreservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/lodgingreservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/lodgingreservation.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/rentalcarreservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/rentalcarreservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/rentalcarreservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/rentalcarreservation.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/semantic.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/semantic.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/semantic.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/semantic.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/taxireservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/taxireservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/taxireservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/taxireservation.html
diff --git a/plugins/messageviewer/bodypartformatter/semantic/templates/trainreservation.html b/plugins/messageviewer/bodypartformatter/itinerary/templates/trainreservation.html
similarity index 100%
rename from plugins/messageviewer/bodypartformatter/semantic/templates/trainreservation.html
rename to plugins/messageviewer/bodypartformatter/itinerary/templates/trainreservation.html