move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4

esm typo esm typo
author: Bret Curtis <bret.curtis@gmail.com> 2022-01-22 15:58:41 +0100
committer: Bret Curtis <psi29a@gmail.com> 2022-01-23 17:04:48 +0100
commit: d1fb8545217a4e4044e6825eace60a485618954c (patch)
tree: c436c6712b3238af4991b139e7f00a5c9f795c15
parent: c263bbf0f68aa66891efadb7d09bc2f31706f088 (diff)
448 files changed, 687 insertions, 684 deletions
diff --git a/apps/benchmarks/detournavigator/navmeshtilescache.cpp b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
index c27fdc4289..e8a4be1e46 100644
--- a/apps/benchmarks/detournavigator/navmeshtilescache.cpp
+++ b/apps/benchmarks/detournavigator/navmeshtilescache.cpp
@@ -1,7 +1,7 @@
 #include <benchmark/benchmark.h>
 
 #include <components/detournavigator/navmeshtilescache.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include <algorithm>
 #include <random>
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index a0ee654da9..60509d7c87 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -10,8 +10,8 @@
 
 #include <boost/program_options.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/records.hpp>
 
 #include "record.hpp"
diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index 24e3605eb2..d6cae207c9 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -1,17 +1,17 @@
 #include "labels.hpp"
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/essimporter/convertacdt.hpp b/apps/essimporter/convertacdt.hpp
index 4059dd1af8..00e90ababf 100644
--- a/apps/essimporter/convertacdt.hpp
+++ b/apps/essimporter/convertacdt.hpp
@@ -1,10 +1,10 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTACDT_H
 #define OPENMW_ESSIMPORT_CONVERTACDT_H
 
-#include <components/esm/creaturestats.hpp>
-#include <components/esm/npcstats.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/animationstate.hpp>
+#include <components/esm3/creaturestats.hpp>
+#include <components/esm3/npcstats.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/animationstate.hpp>
 
 #include "importacdt.hpp"
 
diff --git a/apps/essimporter/convertcntc.hpp b/apps/essimporter/convertcntc.hpp
index c299d87a1e..2dc51949b1 100644
--- a/apps/essimporter/convertcntc.hpp
+++ b/apps/essimporter/convertcntc.hpp
@@ -3,7 +3,7 @@
 
 #include "importcntc.hpp"
 
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/containerstate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertcrec.hpp b/apps/essimporter/convertcrec.hpp
index 7d317f03e8..fa2e7e807f 100644
--- a/apps/essimporter/convertcrec.hpp
+++ b/apps/essimporter/convertcrec.hpp
@@ -3,7 +3,7 @@
 
 #include "importcrec.hpp"
 
-#include <components/esm/creaturestate.hpp>
+#include <components/esm3/creaturestate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 6e79e27f18..ad28a9295f 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -5,8 +5,8 @@
 
 #include <osgDB/WriteFile>
 
-#include <components/esm/creaturestate.hpp>
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/creaturestate.hpp>
+#include <components/esm3/containerstate.hpp>
 
 #include <components/misc/constants.hpp>
 
diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 81b9711bbf..8b71775759 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -6,23 +6,23 @@
 #include <osg/Image>
 #include <osg/ref_ptr>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellstate.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/custommarkerstate.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/weatherstate.hpp>
-#include <components/esm/globalscript.hpp>
-#include <components/esm/queststate.hpp>
-#include <components/esm/stolenitems.hpp>
-#include <components/esm/projectilestate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/custommarkerstate.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/weatherstate.hpp>
+#include <components/esm3/globalscript.hpp>
+#include <components/esm3/queststate.hpp>
+#include <components/esm3/stolenitems.hpp>
+#include <components/esm3/projectilestate.hpp>
 
 #include "importcrec.hpp"
 #include "importcntc.hpp"
diff --git a/apps/essimporter/convertinventory.hpp b/apps/essimporter/convertinventory.hpp
index 8abe85a44a..95d134d4fc 100644
--- a/apps/essimporter/convertinventory.hpp
+++ b/apps/essimporter/convertinventory.hpp
@@ -3,7 +3,7 @@
 
 #include "importinventory.hpp"
 
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/inventorystate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertnpcc.hpp b/apps/essimporter/convertnpcc.hpp
index eb12d8f3bc..d0a395e33e 100644
--- a/apps/essimporter/convertnpcc.hpp
+++ b/apps/essimporter/convertnpcc.hpp
@@ -3,7 +3,7 @@
 
 #include "importnpcc.hpp"
 
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/npcstate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertplayer.hpp b/apps/essimporter/convertplayer.hpp
index 1d2fdc87a6..73c98309f8 100644
--- a/apps/essimporter/convertplayer.hpp
+++ b/apps/essimporter/convertplayer.hpp
@@ -3,8 +3,8 @@
 
 #include "importplayer.hpp"
 
-#include <components/esm/player.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/convertscpt.hpp b/apps/essimporter/convertscpt.hpp
index 3390bd6070..f4a4e34fe4 100644
--- a/apps/essimporter/convertscpt.hpp
+++ b/apps/essimporter/convertscpt.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_CONVERTSCPT_H
 #define OPENMW_ESSIMPORT_CONVERTSCPT_H
 
-#include <components/esm/globalscript.hpp>
+#include <components/esm3/globalscript.hpp>
 
 #include "importscpt.hpp"
 
diff --git a/apps/essimporter/convertscri.hpp b/apps/essimporter/convertscri.hpp
index 2d89456662..3908dbacf2 100644
--- a/apps/essimporter/convertscri.hpp
+++ b/apps/essimporter/convertscri.hpp
@@ -3,7 +3,7 @@
 
 #include "importscri.hpp"
 
-#include <components/esm/locals.hpp>
+#include <components/esm3/locals.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 0ddd2eb64c..69760a6bdb 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -1,8 +1,8 @@
 #include "importacdt.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index 354eca32d8..6ecb72e334 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importscri.hpp"
 
diff --git a/apps/essimporter/importcellref.cpp b/apps/essimporter/importcellref.cpp
index 442a7781c7..e6c62cc812 100644
--- a/apps/essimporter/importcellref.cpp
+++ b/apps/essimporter/importcellref.cpp
@@ -1,6 +1,6 @@
 #include "importcellref.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcellref.hpp b/apps/essimporter/importcellref.hpp
index 4d7f07a6cc..d69a0a829d 100644
--- a/apps/essimporter/importcellref.hpp
+++ b/apps/essimporter/importcellref.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include "importacdt.hpp"
 
diff --git a/apps/essimporter/importcntc.cpp b/apps/essimporter/importcntc.cpp
index a492aef5aa..a4b54ca7b4 100644
--- a/apps/essimporter/importcntc.cpp
+++ b/apps/essimporter/importcntc.cpp
@@ -1,6 +1,6 @@
 #include "importcntc.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcrec.cpp b/apps/essimporter/importcrec.cpp
index 64879f2afc..6cef13333b 100644
--- a/apps/essimporter/importcrec.cpp
+++ b/apps/essimporter/importcrec.cpp
@@ -1,6 +1,6 @@
 #include "importcrec.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcrec.hpp b/apps/essimporter/importcrec.hpp
index 5110fbc689..77933eafe8 100644
--- a/apps/essimporter/importcrec.hpp
+++ b/apps/essimporter/importcrec.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_ESSIMPORT_CREC_H
 
 #include "importinventory.hpp"
-#include <components/esm/aipackage.hpp>
+#include <components/esm3/aipackage.hpp>
 
 namespace ESM
 {
diff --git a/apps/essimporter/importdial.cpp b/apps/essimporter/importdial.cpp
index 5797a708a1..1467e43365 100644
--- a/apps/essimporter/importdial.cpp
+++ b/apps/essimporter/importdial.cpp
@@ -1,6 +1,6 @@
 #include "importdial.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 84f13b8c91..996a24b011 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -8,20 +8,20 @@
 #include <osgDB/ReadFile>
 #include <osg/ImageUtils>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/defs.hpp>
 
-#include <components/esm/savedgame.hpp>
-#include <components/esm/player.hpp>
+#include <components/esm3/savedgame.hpp>
+#include <components/esm3/player.hpp>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadlevlist.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 #include <components/misc/constants.hpp>
 
diff --git a/apps/essimporter/importercontext.hpp b/apps/essimporter/importercontext.hpp
index 179e00f087..149059219c 100644
--- a/apps/essimporter/importercontext.hpp
+++ b/apps/essimporter/importercontext.hpp
@@ -3,13 +3,13 @@
 
 #include <map>
 
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/player.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/globalmap.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/player.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/globalmap.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 #include "importnpcc.hpp"
 #include "importcrec.hpp"
diff --git a/apps/essimporter/importgame.cpp b/apps/essimporter/importgame.cpp
index 1012541b49..df36afe784 100644
--- a/apps/essimporter/importgame.cpp
+++ b/apps/essimporter/importgame.cpp
@@ -1,6 +1,6 @@
 #include "importgame.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importinfo.cpp b/apps/essimporter/importinfo.cpp
index 1131553709..49a0c745f6 100644
--- a/apps/essimporter/importinfo.cpp
+++ b/apps/essimporter/importinfo.cpp
@@ -1,6 +1,6 @@
 #include "importinfo.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index e91c39452c..c4d11763f5 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importinventory.hpp b/apps/essimporter/importinventory.hpp
index a1324a6960..6f757ac9a0 100644
--- a/apps/essimporter/importinventory.hpp
+++ b/apps/essimporter/importinventory.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
 
 #include "importscri.hpp"
diff --git a/apps/essimporter/importjour.cpp b/apps/essimporter/importjour.cpp
index e5d24e113c..1c46b3159c 100644
--- a/apps/essimporter/importjour.cpp
+++ b/apps/essimporter/importjour.cpp
@@ -1,6 +1,6 @@
 #include "importjour.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importklst.cpp b/apps/essimporter/importklst.cpp
index daa1ab0774..5d9f22a31c 100644
--- a/apps/essimporter/importklst.cpp
+++ b/apps/essimporter/importklst.cpp
@@ -1,6 +1,6 @@
 #include "importklst.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importnpcc.cpp b/apps/essimporter/importnpcc.cpp
index 3cbd749ce8..4d8da66f0f 100644
--- a/apps/essimporter/importnpcc.cpp
+++ b/apps/essimporter/importnpcc.cpp
@@ -1,6 +1,6 @@
 #include "importnpcc.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index a23ab1e50b..d525c00743 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_ESSIMPORT_NPCC_H
 #define OPENMW_ESSIMPORT_NPCC_H
 
-#include <components/esm/loadcont.hpp>
+#include <components/esm3/loadcont.hpp>
 
-#include <components/esm/aipackage.hpp>
+#include <components/esm3/aipackage.hpp>
 
 #include "importinventory.hpp"
 
diff --git a/apps/essimporter/importplayer.cpp b/apps/essimporter/importplayer.cpp
index 8c275a2868..52e4a9b7d0 100644
--- a/apps/essimporter/importplayer.cpp
+++ b/apps/essimporter/importplayer.cpp
@@ -1,6 +1,6 @@
 #include "importplayer.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index 924522383b..6c8f211c57 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -5,7 +5,7 @@
 #include <string>
 
 #include <components/esm/defs.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/esmcommon.hpp>
 
 #include "importacdt.hpp"
diff --git a/apps/essimporter/importproj.cpp b/apps/essimporter/importproj.cpp
index b2dcf4e7da..aada41a778 100644
--- a/apps/essimporter/importproj.cpp
+++ b/apps/essimporter/importproj.cpp
@@ -1,6 +1,6 @@
 #include "importproj.h"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importques.cpp b/apps/essimporter/importques.cpp
index 78b779e439..b57083b0b3 100644
--- a/apps/essimporter/importques.cpp
+++ b/apps/essimporter/importques.cpp
@@ -1,6 +1,6 @@
 #include "importques.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importscpt.cpp b/apps/essimporter/importscpt.cpp
index 652383cdaa..4df46ddc8d 100644
--- a/apps/essimporter/importscpt.cpp
+++ b/apps/essimporter/importscpt.cpp
@@ -1,6 +1,6 @@
 #include "importscpt.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 
 
diff --git a/apps/essimporter/importscpt.hpp b/apps/essimporter/importscpt.hpp
index 6bfd2603a2..15f4fde598 100644
--- a/apps/essimporter/importscpt.hpp
+++ b/apps/essimporter/importscpt.hpp
@@ -3,7 +3,7 @@
 
 #include "importscri.hpp"
 
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 namespace ESM
 {
diff --git a/apps/essimporter/importscri.cpp b/apps/essimporter/importscri.cpp
index de0b35c86c..91971dde3b 100644
--- a/apps/essimporter/importscri.cpp
+++ b/apps/essimporter/importscri.cpp
@@ -1,6 +1,6 @@
 #include "importscri.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importscri.hpp b/apps/essimporter/importscri.hpp
index fe68e50515..73d8942f81 100644
--- a/apps/essimporter/importscri.hpp
+++ b/apps/essimporter/importscri.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTSCRI_H
 #define OPENMW_ESSIMPORT_IMPORTSCRI_H
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include <vector>
 
diff --git a/apps/essimporter/importsplm.cpp b/apps/essimporter/importsplm.cpp
index 9fdba4ddb5..f635a8fdbb 100644
--- a/apps/essimporter/importsplm.cpp
+++ b/apps/essimporter/importsplm.cpp
@@ -1,6 +1,6 @@
 #include "importsplm.h"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESSImport
 {
diff --git a/apps/launcher/utils/cellnameloader.cpp b/apps/launcher/utils/cellnameloader.cpp
index e8ba54651c..4cb8b545aa 100644
--- a/apps/launcher/utils/cellnameloader.cpp
+++ b/apps/launcher/utils/cellnameloader.cpp
@@ -1,6 +1,6 @@
 #include "cellnameloader.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 
 QSet<QString> CellNameLoader::getCellNames(QStringList &contentPaths)
diff --git a/apps/launcher/utils/cellnameloader.hpp b/apps/launcher/utils/cellnameloader.hpp
index 899ff75adb..6143b78bd9 100644
--- a/apps/launcher/utils/cellnameloader.hpp
+++ b/apps/launcher/utils/cellnameloader.hpp
@@ -4,7 +4,7 @@
 #include <QSet>
 #include <QString>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace ESM {class ESMReader; struct Cell;}
 namespace ContentSelectorView {class ContentSelector;}
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 35a1c4ec8b..68f266ed6e 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include <components/misc/stringops.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 3e867fcbc9..aee040bb9d 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -4,8 +4,8 @@
 #include <components/debug/debugging.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/recastglobalallocator.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/fallback/fallback.hpp>
diff --git a/apps/navmeshtool/navmesh.cpp b/apps/navmeshtool/navmesh.cpp
index 4187197947..d59d274c21 100644
--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@@ -16,7 +16,7 @@
 #include <components/detournavigator/serialization.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/tileposition.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/misc/guarded.hpp>
 #include <components/misc/progressreporter.hpp>
 #include <components/sceneutil/workqueue.hpp>
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
index d05a8fe3f0..227f73ad33 100644
--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@@ -7,10 +7,10 @@
 #include <components/detournavigator/objectid.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
-#include <components/esm/cellref.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>
diff --git a/apps/navmeshtool/worldspacedata.hpp b/apps/navmeshtool/worldspacedata.hpp
index 3dccd5a8bc..2efb0954e0 100644
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@@ -3,7 +3,7 @@
 
 #include <components/bullethelpers/collisionobject.hpp>
 #include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/convert.hpp>
 #include <components/resource/bulletshape.hpp>
 
diff --git a/apps/opencs/model/doc/runner.hpp b/apps/opencs/model/doc/runner.hpp
index 517122492a..0cfbaab3af 100644
--- a/apps/opencs/model/doc/runner.hpp
+++ b/apps/opencs/model/doc/runner.hpp
@@ -10,7 +10,7 @@
 #include <QProcess>
 #include <QTextDocument>
 
-#include <components/esm/debugprofile.hpp>
+#include <components/esm3/debugprofile.hpp>
 
 class QTemporaryFile;
 
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index a410d34b2a..5efa474f76 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -4,7 +4,7 @@
 
 #include <QUndoStack>
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../world/infocollection.hpp"
 #include "../world/cellcoordinates.hpp"
diff --git a/apps/opencs/model/doc/savingstate.hpp b/apps/opencs/model/doc/savingstate.hpp
index e6c8c545a7..727352a872 100644
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@@ -8,7 +8,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/to_utf8/to_utf8.hpp>
 
diff --git a/apps/opencs/model/tools/birthsigncheck.hpp b/apps/opencs/model/tools/birthsigncheck.hpp
index 498894f882..1d88673adc 100644
--- a/apps/opencs/model/tools/birthsigncheck.hpp
+++ b/apps/opencs/model/tools/birthsigncheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_BIRTHSIGNCHECK_H
 #define CSM_TOOLS_BIRTHSIGNCHECK_H
 
-#include <components/esm/loadbsgn.hpp>
+#include <components/esm3/loadbsgn.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/resources.hpp"
diff --git a/apps/opencs/model/tools/bodypartcheck.hpp b/apps/opencs/model/tools/bodypartcheck.hpp
index 2c379bd078..2eba75c495 100644
--- a/apps/opencs/model/tools/bodypartcheck.hpp
+++ b/apps/opencs/model/tools/bodypartcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_BODYPARTCHECK_H
 #define CSM_TOOLS_BODYPARTCHECK_H
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index a82121597c..aa38ed46ce 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -2,8 +2,8 @@
 
 #include <map>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../prefs/state.hpp"
 
diff --git a/apps/opencs/model/tools/classcheck.hpp b/apps/opencs/model/tools/classcheck.hpp
index a78c2eb975..9d66336d43 100644
--- a/apps/opencs/model/tools/classcheck.hpp
+++ b/apps/opencs/model/tools/classcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_CLASSCHECK_H
 #define CSM_TOOLS_CLASSCHECK_H
 
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/enchantmentcheck.hpp b/apps/opencs/model/tools/enchantmentcheck.hpp
index e9c8b9eece..8ee71ad7cb 100644
--- a/apps/opencs/model/tools/enchantmentcheck.hpp
+++ b/apps/opencs/model/tools/enchantmentcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_ENCHANTMENTCHECK_H
 #define CSM_TOOLS_ENCHANTMENTCHECK_H
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index 8a198e9535..dbecea9589 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -2,7 +2,7 @@
 
 #include <map>
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../prefs/state.hpp"
 
diff --git a/apps/opencs/model/tools/factioncheck.hpp b/apps/opencs/model/tools/factioncheck.hpp
index d281c1b416..a6a6815976 100644
--- a/apps/opencs/model/tools/factioncheck.hpp
+++ b/apps/opencs/model/tools/factioncheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_FACTIONCHECK_H
 #define CSM_TOOLS_FACTIONCHECK_H
 
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/gmstcheck.hpp b/apps/opencs/model/tools/gmstcheck.hpp
index 2c12a8607a..c57f6a088b 100644
--- a/apps/opencs/model/tools/gmstcheck.hpp
+++ b/apps/opencs/model/tools/gmstcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_GMSTCHECK_H
 #define CSM_TOOLS_GMSTCHECK_H
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/journalcheck.hpp b/apps/opencs/model/tools/journalcheck.hpp
index b63127b522..65ce8b85df 100644
--- a/apps/opencs/model/tools/journalcheck.hpp
+++ b/apps/opencs/model/tools/journalcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_JOURNALCHECK_H
 #define CSM_TOOLS_JOURNALCHECK_H
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/infocollection.hpp"
diff --git a/apps/opencs/model/tools/magiceffectcheck.hpp b/apps/opencs/model/tools/magiceffectcheck.hpp
index 4b2c24cc7c..e264683d04 100644
--- a/apps/opencs/model/tools/magiceffectcheck.hpp
+++ b/apps/opencs/model/tools/magiceffectcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_MAGICEFFECTCHECK_HPP
 #define CSM_TOOLS_MAGICEFFECTCHECK_HPP
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../world/idcollection.hpp"
 #include "../world/refidcollection.hpp"
diff --git a/apps/opencs/model/tools/racecheck.hpp b/apps/opencs/model/tools/racecheck.hpp
index 7c70f13b00..fe08f4bb67 100644
--- a/apps/opencs/model/tools/racecheck.hpp
+++ b/apps/opencs/model/tools/racecheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_RACECHECK_H
 #define CSM_TOOLS_RACECHECK_H
 
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/regioncheck.hpp b/apps/opencs/model/tools/regioncheck.hpp
index e7ddb0bcab..71893c6c5d 100644
--- a/apps/opencs/model/tools/regioncheck.hpp
+++ b/apps/opencs/model/tools/regioncheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_REGIONCHECK_H
 #define CSM_TOOLS_REGIONCHECK_H
 
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/skillcheck.hpp b/apps/opencs/model/tools/skillcheck.hpp
index b1af887f6c..f13a5b7a29 100644
--- a/apps/opencs/model/tools/skillcheck.hpp
+++ b/apps/opencs/model/tools/skillcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SKILLCHECK_H
 #define CSM_TOOLS_SKILLCHECK_H
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/soundcheck.hpp b/apps/opencs/model/tools/soundcheck.hpp
index 80eb9e7f29..fc3255c538 100644
--- a/apps/opencs/model/tools/soundcheck.hpp
+++ b/apps/opencs/model/tools/soundcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SOUNDCHECK_H
 #define CSM_TOOLS_SOUNDCHECK_H
 
-#include <components/esm/loadsoun.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index dc9ce65c0a..6cec24b705 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <map>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../prefs/state.hpp"
 
diff --git a/apps/opencs/model/tools/spellcheck.hpp b/apps/opencs/model/tools/spellcheck.hpp
index bfc9628107..1a8d3d0237 100644
--- a/apps/opencs/model/tools/spellcheck.hpp
+++ b/apps/opencs/model/tools/spellcheck.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_SPELLCHECK_H
 #define CSM_TOOLS_SPELLCHECK_H
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../world/idcollection.hpp"
 
diff --git a/apps/opencs/model/tools/startscriptcheck.hpp b/apps/opencs/model/tools/startscriptcheck.hpp
index a45d3c9437..4113090793 100644
--- a/apps/opencs/model/tools/startscriptcheck.hpp
+++ b/apps/opencs/model/tools/startscriptcheck.hpp
@@ -1,8 +1,8 @@
 #ifndef CSM_TOOLS_STARTSCRIPTCHECK_H
 #define CSM_TOOLS_STARTSCRIPTCHECK_H
 
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include "../doc/stage.hpp"
 
diff --git a/apps/opencs/model/tools/topicinfocheck.hpp b/apps/opencs/model/tools/topicinfocheck.hpp
index b9dbdc1536..de3fa82ae3 100644
--- a/apps/opencs/model/tools/topicinfocheck.hpp
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@@ -3,13 +3,13 @@
 
 #include <set>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadregn.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../world/cell.hpp"
 #include "../world/idcollection.hpp"
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 7e7f926384..bc8f519dcd 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -1,10 +1,10 @@
 #include "actoradapter.hpp"
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/mappings.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/sceneutil/actorutil.hpp>
 
 #include "data.hpp"
diff --git a/apps/opencs/model/world/actoradapter.hpp b/apps/opencs/model/world/actoradapter.hpp
index 826e3b9179..2d8375bb2f 100644
--- a/apps/opencs/model/world/actoradapter.hpp
+++ b/apps/opencs/model/world/actoradapter.hpp
@@ -10,8 +10,8 @@
 #include <QObject>
 #include <QModelIndex>
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 #include <components/misc/weakcache.hpp>
 
 #include "refidcollection.hpp"
diff --git a/apps/opencs/model/world/cell.hpp b/apps/opencs/model/world/cell.hpp
index 160610874c..256a07d301 100644
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/cellcoordinates.cpp b/apps/opencs/model/world/cellcoordinates.cpp
index af8c26d70a..9fde26a962 100644
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@@ -5,7 +5,7 @@
 #include <ostream>
 #include <sstream>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/constants.hpp>
 
 CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index e0148d6cc6..493f62694e 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -9,9 +9,9 @@
 #include <QColor>
 #include <QVector>
 
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "columnbase.hpp"
 #include "columns.hpp"
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 8e53b3b270..3c5ea52586 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -405,7 +405,7 @@ namespace
         "Combat", "Magic", "Stealth", 0
     };
 
-    // see ESM::Attribute::AttributeID in <component/esm/attr.hpp>
+    // see ESM::Attribute::AttributeID in <component/esm3/attr.hpp>
     static const char *sAttributes[] =
     {
         "Strength", "Intelligence", "Willpower", "Agility", "Speed", "Endurance", "Personality",
@@ -498,7 +498,7 @@ namespace
         "Alteration", "Conjuration", "Destruction", "Illusion", "Mysticism", "Restoration", 0
     };
 
-    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm/loadskil.hpp>
+    // impact from magic effects, see ESM::Skill::SkillEnum in <component/esm3/loadskil.hpp>
     static const char *sSkills[] =
     {
         "Block", "Armorer", "MediumArmor", "HeavyArmor", "BluntWeapon",
@@ -509,13 +509,13 @@ namespace
         "Speechcraft", "HandToHand", 0
     };
 
-    // range of magic effects, see ESM::RangeType in <component/esm/defs.hpp>
+    // range of magic effects, see ESM::RangeType in <component/esm3/defs.hpp>
     static const char *sEffectRange[] =
     {
         "Self", "Touch", "Target", 0
     };
 
-    // magic effect names, see ESM::MagicEffect::Effects in <component/esm/loadmgef.hpp>
+    // magic effect names, see ESM::MagicEffect::Effects in <component/esm3/loadmgef.hpp>
     static const char *sEffectId[] =
     {
         "WaterBreathing", "SwiftSwim", "WaterWalking", "Shield", "FireShield",
@@ -549,7 +549,7 @@ namespace
         "SummonBonewolf", "SummonCreature04", "SummonCreature05", 0
     };
 
-    // see ESM::PartReferenceType in <component/esm/loadarmo.hpp>
+    // see ESM::PartReferenceType in <component/esm3/loadarmo.hpp>
     static const char *sPartRefType[] =
     {
         "Head", "Hair", "Neck", "Cuirass", "Groin",
@@ -560,7 +560,7 @@ namespace
         "Weapon", "Tail", 0
     };
 
-    // see the enums in <component/esm/aipackage.hpp>
+    // see the enums in <component/esm3/aipackage.hpp>
     static const char *sAiPackageType[] =
     {
         "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index ec4c1f6a13..2018b3e8fd 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -5,10 +5,10 @@
 
 #include <QAbstractItemModel>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadglob.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/shadow.hpp>
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index b1c20b8629..4a5d8f51a6 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -9,25 +9,25 @@
 #include <QObject>
 #include <QModelIndex>
 
-#include <components/esm/loadglob.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/loadrace.hpp>
-#include <components/esm/loadsoun.hpp>
-#include <components/esm/loadscpt.hpp>
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadbsgn.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadbody.hpp>
-#include <components/esm/loadsndg.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadsscr.hpp>
-#include <components/esm/debugprofile.hpp>
-#include <components/esm/filter.hpp>
+#include <components/esm3/loadglob.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/debugprofile.hpp>
+#include <components/esm3/filter.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index bbc49f18c1..9261d287f5 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_IDCOLLECTION_H
 #define CSM_WOLRD_IDCOLLECTION_H
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "collection.hpp"
 #include "land.hpp"
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 215f42133d..2e2ea41761 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -7,7 +7,7 @@
 #include <map>
 #include <stdexcept>
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "collectionbase.hpp"
diff --git a/apps/opencs/model/world/info.hpp b/apps/opencs/model/world/info.hpp
index 1bcb2dc2d0..9405c002c7 100644
--- a/apps/opencs/model/world/info.hpp
+++ b/apps/opencs/model/world/info.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WOLRD_INFO_H
 #define CSM_WOLRD_INFO_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index d58a8327f2..a7cdc28d28 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -4,8 +4,8 @@
 #include <iterator>
 #include <cassert>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
index ce26a46dc7..7c7a839fa6 100644
--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -1,7 +1,7 @@
 #ifndef CSM_WORLD_INFOSELECTWRAPPER_H
 #define CSM_WORLD_INFOSELECTWRAPPER_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/land.hpp b/apps/opencs/model/world/land.hpp
index e604f13119..99da5cfac0 100644
--- a/apps/opencs/model/world/land.hpp
+++ b/apps/opencs/model/world/land.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/landtexture.cpp b/apps/opencs/model/world/landtexture.cpp
index 43deb64a47..c8ac8369ed 100644
--- a/apps/opencs/model/world/landtexture.cpp
+++ b/apps/opencs/model/world/landtexture.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/landtexture.hpp b/apps/opencs/model/world/landtexture.hpp
index a7376438c1..601d4b79c9 100644
--- a/apps/opencs/model/world/landtexture.hpp
+++ b/apps/opencs/model/world/landtexture.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <components/esm/loadltex.hpp>
+#include <components/esm3/loadltex.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/metadata.cpp b/apps/opencs/model/world/metadata.cpp
index b2fa3487cd..acee441883 100644
--- a/apps/opencs/model/world/metadata.cpp
+++ b/apps/opencs/model/world/metadata.cpp
@@ -1,8 +1,8 @@
 #include "metadata.hpp"
 
-#include <components/esm/loadtes3.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadtes3.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 void CSMWorld::MetaData::blank()
 {
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index e8b4102d7c..08a23f4410 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -1,7 +1,7 @@
 #include "nestedcoladapterimp.hpp"
 
-#include <components/esm/loadregn.hpp>
-#include <components/esm/loadfact.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "idcollection.hpp"
 #include "pathgrid.hpp"
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index 54780d290e..a5daefc3cd 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -3,12 +3,12 @@
 
 #include <QVariant>
 
-#include <components/esm/loadpgrd.hpp>
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp> // for converting magic effect id to string & back
-#include <components/esm/loadskil.hpp> // for converting skill names
+#include <components/esm3/loadpgrd.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadmgef.hpp> // for converting magic effect id to string & back
+#include <components/esm3/loadskil.hpp> // for converting skill names
 #include <components/esm/attr.hpp>     // for converting attributes
-#include <components/esm/loadrace.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "nestedcolumnadapter.hpp"
 #include "nestedtablewrapper.hpp"
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index ce74d419e4..712b3969d6 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/ref.hpp b/apps/opencs/model/world/ref.hpp
index 23b4ad1b5c..1eefe79f67 100644
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@@ -3,7 +3,7 @@
 
 #include <utility>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace CSMWorld
 {
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index c6f5148290..76a3b7311a 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -1,6 +1,6 @@
 #include "refcollection.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "ref.hpp"
 #include "cell.hpp"
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 0dfc9945f7..d2c2a46db7 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <utility>
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "nestedtablewrapper.hpp"
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 153d1bde91..55668d16d8 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -5,11 +5,11 @@
 
 #include <QVariant>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "columnbase.hpp"
 #include "record.hpp"
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 928c7284ad..2e0c7e2028 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <string_view>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "refidadapter.hpp"
 #include "refidadapterimp.hpp"
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index b9dee80638..ff2232dffe 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -7,26 +7,26 @@
 #include <cassert>
 #include <string_view>
 
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
index 94b82c96cd..d33c6f3f28 100644
--- a/apps/opencs/view/render/actor.cpp
+++ b/apps/opencs/view/render/actor.cpp
@@ -3,7 +3,7 @@
 #include <osg/Group>
 #include <osg/Node>
 
-#include <components/esm/mappings.hpp>
+#include <components/esm3/mappings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/apps/opencs/view/render/actor.hpp b/apps/opencs/view/render/actor.hpp
index 8172e6fff7..414cd438d7 100644
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@@ -8,7 +8,7 @@
 
 #include <QObject>
 
-#include <components/esm/loadarmo.hpp>
+#include <components/esm3/loadarmo.hpp>
 #include <components/sceneutil/visitor.hpp>
 
 #include "../../model/world/actoradapter.hpp"
diff --git a/apps/opencs/view/render/brushdraw.hpp b/apps/opencs/view/render/brushdraw.hpp
index 0551631cd9..f95a0c5a7c 100644
--- a/apps/opencs/view/render/brushdraw.hpp
+++ b/apps/opencs/view/render/brushdraw.hpp
@@ -4,7 +4,7 @@
 #include <osg/Group>
 #include <osg/Geometry>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../widget/brushshapes.hpp"
 
 namespace CSVRender
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 2502dc1fd0..04e52bcd1f 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -8,8 +8,8 @@
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 #include <components/terrain/terraingrid.hpp>
 
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index d8ff638010..b93b5d1fcf 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -5,7 +5,7 @@
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "mask.hpp"
 
diff --git a/apps/opencs/view/render/cellwater.cpp b/apps/opencs/view/render/cellwater.cpp
index f8857c3afc..9e4dbd9f14 100644
--- a/apps/opencs/view/render/cellwater.cpp
+++ b/apps/opencs/view/render/cellwater.cpp
@@ -5,7 +5,7 @@
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/resource/imagemanager.hpp>
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
index 699bf5d016..2820d7578d 100644
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@@ -3,7 +3,7 @@
 #include <QPointer>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "editmode.hpp"
 #include "terrainselection.hpp"
diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 1fc183ba47..814b011de1 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -6,7 +6,7 @@
 #include <osg/Geometry>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 1d0da7bb59..4b4758e75e 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -8,7 +8,7 @@
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include "../../model/world/cellcoordinates.hpp"
 
 namespace osg
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 936e8d6778..9052cc5e6b 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -15,7 +15,7 @@
 #include <osg/Group>
 #include <osg/Vec3f>
 
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/debug/debuglog.hpp>
 
 #include "../widget/brushshapes.hpp"
diff --git a/apps/opencs/view/world/dialoguecreator.cpp b/apps/opencs/view/world/dialoguecreator.cpp
index 7c6fb2e81f..82ebee8467 100644
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@@ -1,6 +1,6 @@
 #include "dialoguecreator.hpp"
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../../model/doc/document.hpp"
 
diff --git a/apps/opencs/view/world/globalcreator.cpp b/apps/opencs/view/world/globalcreator.cpp
index c7b140e156..20a5c75cf6 100644
--- a/apps/opencs/view/world/globalcreator.cpp
+++ b/apps/opencs/view/world/globalcreator.cpp
@@ -1,6 +1,6 @@
 #include "globalcreator.hpp"
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
diff --git a/apps/opencs/view/world/vartypedelegate.hpp b/apps/opencs/view/world/vartypedelegate.hpp
index 44705e80ec..5b0daec904 100644
--- a/apps/opencs/view/world/vartypedelegate.hpp
+++ b/apps/opencs/view/world/vartypedelegate.hpp
@@ -1,7 +1,7 @@
 #ifndef CSV_WORLD_VARTYPEDELEGATE_H
 #define CSV_WORLD_VARTYPEDELEGATE_H
 
-#include <components/esm/variant.hpp>
+#include <components/esm3/variant.hpp>
 
 #include "enumdelegate.hpp"
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index d1747a2e39..1d9e4fae2d 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -8,7 +8,7 @@
 #include <set>
 #include <deque>
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 
 #include <osg/Timer>
 
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 6c53ba72f3..a60c44265c 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -1,6 +1,6 @@
 #include "activator.hpp"
 
-#include <components/esm/loadacti.hpp>
+#include <components/esm3/loadacti.hpp>
 #include <components/misc/rng.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
diff --git a/apps/openmw/mwclass/actor.cpp b/apps/openmw/mwclass/actor.cpp
index ad43bd6e5f..9b5e10e1c7 100644
--- a/apps/openmw/mwclass/actor.cpp
+++ b/apps/openmw/mwclass/actor.cpp
@@ -1,6 +1,6 @@
 #include "actor.hpp"
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 596bdf26ec..82055e2500 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -3,7 +3,7 @@
 
 #include "../mwworld/class.hpp"
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 6e9d8b3779..76bee280bc 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -1,6 +1,6 @@
 #include "apparatus.hpp"
 
-#include <components/esm/loadappa.hpp>
+#include <components/esm3/loadappa.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index bc2d788b5b..5dfc5e12f1 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -1,8 +1,8 @@
 #include "armor.hpp"
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index eef8e02808..3fcd7368d6 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -1,6 +1,6 @@
 #include "book.hpp"
 
-#include <components/esm/loadbook.hpp>
+#include <components/esm3/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index ce8c79d02e..a5f5d828c9 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -1,6 +1,6 @@
 #include "clothing.hpp"
 
-#include <components/esm/loadclot.hpp>
+#include <components/esm3/loadclot.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 0f45c25744..b043b4671d 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -1,7 +1,7 @@
 #include "container.hpp"
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/containerstate.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/containerstate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 03b7cfb069..ba13f5f6d9 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -2,8 +2,8 @@
 
 #include <components/misc/rng.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/creaturestate.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/creaturestate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index ee33242126..66e35e5bf8 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -1,7 +1,7 @@
 #include "creaturelevlist.hpp"
 
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/creaturelevliststate.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/creaturelevliststate.hpp>
 
 #include "../mwmechanics/levelledlist.hpp"
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 01ff2aa440..81a45f3a30 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -1,7 +1,7 @@
 #include "door.hpp"
 
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/doorstate.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/doorstate.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index f9288a88ce..e09d0de6c0 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWCLASS_DOOR_H
 #define GAME_MWCLASS_DOOR_H
 
-#include <components/esm/loaddoor.hpp>
+#include <components/esm3/loaddoor.hpp>
 
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index f582812934..424996e417 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -1,6 +1,6 @@
 #include "ingredient.hpp"
 
-#include <components/esm/loadingr.hpp>
+#include <components/esm3/loadingr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/itemlevlist.cpp b/apps/openmw/mwclass/itemlevlist.cpp
index 4ca45152a1..920c6a5d22 100644
--- a/apps/openmw/mwclass/itemlevlist.cpp
+++ b/apps/openmw/mwclass/itemlevlist.cpp
@@ -1,6 +1,6 @@
 #include "itemlevlist.hpp"
 
-#include <components/esm/loadlevlist.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index dbd4e8a184..26f41d30f7 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -1,7 +1,7 @@
 #include "light.hpp"
 
-#include <components/esm/loadligh.hpp>
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/objectstate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ccb5bbbd58..b97093ae2c 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -1,6 +1,6 @@
 #include "lockpick.hpp"
 
-#include <components/esm/loadlock.hpp>
+#include <components/esm3/loadlock.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 30e68d2377..4fbe8ea04e 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -1,6 +1,6 @@
 #include "misc.hpp"
 
-#include <components/esm/loadmisc.hpp>
+#include <components/esm3/loadmisc.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index c46e3c0534..4cf191de9c 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -6,9 +6,9 @@
 #include <components/misc/rng.hpp>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/npcstate.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index e0f8cf8397..9e7aeffbe5 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -1,6 +1,6 @@
 #include "potion.hpp"
 
-#include <components/esm/loadalch.hpp>
+#include <components/esm3/loadalch.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 8291fb8f3c..f705e51435 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -1,6 +1,6 @@
 #include "probe.hpp"
 
-#include <components/esm/loadprob.hpp>
+#include <components/esm3/loadprob.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 42581a8b6b..64fcd08d78 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -1,6 +1,6 @@
 #include "repair.hpp"
 
-#include <components/esm/loadrepa.hpp>
+#include <components/esm3/loadrepa.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index fc350c8351..0b77a5630d 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -1,6 +1,6 @@
 #include "static.hpp"
 
-#include <components/esm/loadstat.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index e7337c83b7..a0ec4bd0e5 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -1,6 +1,6 @@
 #include "weapon.hpp"
 
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadweap.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 9800f1b39c..4612e2bdfd 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -5,10 +5,10 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/loaddial.hpp>
-#include <components/esm/loadinfo.hpp>
-#include <components/esm/dialoguestate.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadinfo.hpp>
+#include <components/esm3/dialoguestate.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/compiler/exception.hpp>
 #include <components/compiler/errorhandler.hpp>
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 57eb74d0a6..7a3e44349e 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -10,7 +10,7 @@
 #include <components/compiler/streamerrorhandler.hpp>
 #include <components/translation/translation.hpp>
 #include <components/misc/stringops.hpp>
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp
index 89a42bf2ea..732cdb1f8f 100644
--- a/apps/openmw/mwdialogue/hypertextparser.cpp
+++ b/apps/openmw/mwdialogue/hypertextparser.cpp
@@ -1,4 +1,4 @@
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 32b2b101d9..7af71d034e 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <components/esm/journalentry.hpp>
+#include <components/esm3/journalentry.hpp>
 
 #include <components/interpreter/defines.hpp>
 
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index b219516183..9f4c8c3689 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -2,10 +2,10 @@
 
 #include <iterator>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/queststate.hpp>
-#include <components/esm/journalentry.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/queststate.hpp>
+#include <components/esm3/journalentry.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index 5f20a8abb2..16e229ca7f 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -1,6 +1,6 @@
 #include "quest.hpp"
 
-#include <components/esm/queststate.hpp>
+#include <components/esm3/queststate.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwdialogue/selectwrapper.hpp b/apps/openmw/mwdialogue/selectwrapper.hpp
index ef787d8eec..dff484562d 100644
--- a/apps/openmw/mwdialogue/selectwrapper.hpp
+++ b/apps/openmw/mwdialogue/selectwrapper.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWDIALOGUE_SELECTWRAPPER_H
 #define GAME_MWDIALOGUE_SELECTWRAPPER_H
 
-#include <components/esm/loadinfo.hpp>
+#include <components/esm3/loadinfo.hpp>
 
 namespace MWDialogue
 {
diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index 86089051d6..8dbb90ca6d 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -3,7 +3,7 @@
 #include <MyGUI_TextBox.h>
 #include <MyGUI_InputManager.h>
 
-#include <components/esm/loadbook.hpp>
+#include <components/esm3/loadbook.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index beb8715fcd..a6c2d10c2f 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -1,7 +1,7 @@
 #ifndef CHARACTER_CREATION_HPP
 #define CHARACTER_CREATION_HPP
 
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include <map>
 #include <vector>
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index bb34a05530..4c5c23535f 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -2,7 +2,7 @@
 #define MWGUI_CLASS_H
 
 #include <components/esm/attr.hpp>
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 #include "widgets.hpp"
 #include "windowbase.hpp"
 
diff --git a/apps/openmw/mwgui/itemchargeview.cpp b/apps/openmw/mwgui/itemchargeview.cpp
index 44fa94f3a2..5f9788bc45 100644
--- a/apps/openmw/mwgui/itemchargeview.cpp
+++ b/apps/openmw/mwgui/itemchargeview.cpp
@@ -7,7 +7,7 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_FactoryManager.h>
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 388bbc7d48..2aa1b51950 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -11,8 +11,8 @@
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_FactoryManager.h>
 
-#include <components/esm/globalmap.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/globalmap.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/settings/settings.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
 
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 61f48d5279..3c3d278476 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -8,9 +8,9 @@
 
 #include "windowpinnablebase.hpp"
 
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 
-#include <components/esm/custommarkerstate.hpp>
+#include <components/esm3/custommarkerstate.hpp>
 #include <components/misc/constants.hpp>
 
 namespace MWRender
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index e737cb2b29..1542312efe 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -1,6 +1,6 @@
 #include "merchantrepair.hpp"
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include <MyGUI_Button.h>
 #include <MyGUI_ScrollView.h>
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index 5daea8f3f8..5ba1b4aafa 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -1,7 +1,7 @@
 #include "pickpocketitemmodel.hpp"
 
 #include <components/misc/rng.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index e55b9b4878..99876e0c85 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -6,8 +6,8 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_RenderManager.h>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/quickkeys.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/quickkeys.hpp>
 
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index cb847536d3..cf3d693e97 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -2,7 +2,7 @@
 #define MWGUI_REVIEW_H
 
 #include <components/esm/attr.hpp>
-#include <components/esm/loadclas.hpp>
+#include <components/esm3/loadclas.hpp>
 #include "windowbase.hpp"
 #include "widgets.hpp"
 
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index f2c967da4e..df703dcb61 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -2,7 +2,7 @@
 
 #include <MyGUI_ScrollView.h>
 
-#include <components/esm/loadbook.hpp>
+#include <components/esm3/loadbook.hpp>
 #include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 9d6ed49d3d..c804eafb72 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -3,19 +3,19 @@
 #include <components/misc/stringops.hpp>
 #include <components/misc/utf8stream.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 73352ac238..1dd16c33cd 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -1,8 +1,8 @@
 #ifndef MWGUI_SPELLCREATION_H
 #define MWGUI_SPELLCREATION_H
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index 0673446fe7..acc5131a22 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -5,7 +5,7 @@
 
 #include <MyGUI_ImageBox.h>
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/spellmodel.hpp b/apps/openmw/mwgui/spellmodel.hpp
index 2404610bf1..af8000c278 100644
--- a/apps/openmw/mwgui/spellmodel.hpp
+++ b/apps/openmw/mwgui/spellmodel.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_GUI_SPELLMODEL_H
 
 #include "../mwworld/ptr.hpp"
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/effectlist.hpp>
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/statswatcher.hpp b/apps/openmw/mwgui/statswatcher.hpp
index 353779d877..6262a50565 100644
--- a/apps/openmw/mwgui/statswatcher.hpp
+++ b/apps/openmw/mwgui/statswatcher.hpp
@@ -4,7 +4,7 @@
 #include <set>
 
 #include <components/esm/attr.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwmechanics/stat.hpp"
 
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 3c55287159..2f27cc029c 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -3,8 +3,8 @@
 
 #include "../mwmechanics/stat.hpp"
 
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 37807fdf2a..c2f7785da3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -28,8 +28,8 @@
 #include <components/sdlutil/sdlcursormanager.hpp>
 #include <components/sdlutil/sdlvideowrapper.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/fontloader/fontloader.hpp>
 
diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp
index 6c22e133bc..da8df3ac6b 100644
--- a/apps/openmw/mwinput/controlswitch.cpp
+++ b/apps/openmw/mwinput/controlswitch.cpp
@@ -1,8 +1,8 @@
 #include "controlswitch.hpp"
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/controlsstate.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/controlsstate.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 4ebe56bf94..31170cafa2 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -3,8 +3,8 @@
 #include <osgViewer/ViewerEventHandlers>
 
 #include <components/sdlutil/sdlinputwrapper.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 4ca9018cad..dbcbbab644 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -1,6 +1,6 @@
 #include "luabindings.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwworld/cellstore.hpp"
 
diff --git a/apps/openmw/mwlua/eventqueue.cpp b/apps/openmw/mwlua/eventqueue.cpp
index 1c136551c4..86086f29db 100644
--- a/apps/openmw/mwlua/eventqueue.cpp
+++ b/apps/openmw/mwlua/eventqueue.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/luascripts.hpp>
 
 #include <components/lua/serialization.hpp>
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 8211c37abf..944a75837e 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -4,8 +4,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/luascripts.hpp>
 
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index 69206e8c37..5d413a4aea 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -142,7 +142,7 @@ namespace MWLua
         }
         else
         {
-            // TODO: If Ptr is empty then try to load the object from esp/esm.
+            // TODO: If Ptr is empty then try to load the object from esp/esm3.
         }
         return ptr;
     }
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 5b1b5df74e..e87721e381 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -3,7 +3,7 @@
 
 #include <typeindex>
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm/luascripts.hpp>
 
diff --git a/apps/openmw/mwlua/worldview.cpp b/apps/openmw/mwlua/worldview.cpp
index 35b1db7a93..be712386c0 100644
--- a/apps/openmw/mwlua/worldview.cpp
+++ b/apps/openmw/mwlua/worldview.cpp
@@ -1,8 +1,8 @@
 #include "worldview.hpp"
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 0c781e81bd..d0cdb4b8bb 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -7,7 +7,7 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 524bdc0475..5fb732ea8a 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -8,7 +8,7 @@
 #include <variant>
 #include <vector>
 
-#include <components/esm/activespells.hpp>
+#include <components/esm3/activespells.hpp>
 
 #include "../mwworld/timestamp.hpp"
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index d5d434e128..7c94c4e604 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -2,8 +2,8 @@
 
 #include <optional>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/debug/debuglog.hpp>
diff --git a/apps/openmw/mwmechanics/actorutil.hpp b/apps/openmw/mwmechanics/actorutil.hpp
index a66d8866bf..91770ddfec 100644
--- a/apps/openmw/mwmechanics/actorutil.hpp
+++ b/apps/openmw/mwmechanics/actorutil.hpp
@@ -3,9 +3,9 @@
 
 #include <algorithm>
 
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 06aef0cdb0..59ad0c1ada 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -1,6 +1,6 @@
 #include "aiactivate.hpp"
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 9eb8a00763..46f04b6f97 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -3,7 +3,7 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include <components/misc/mathutil.hpp>
 
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index e6176c869c..3be68f8394 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -1,7 +1,7 @@
 #include "aicombataction.hpp"
 
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 0184c6e66f..97bb101f06 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -1,7 +1,7 @@
 #include "aiescort.hpp"
 
-#include <components/esm/aisequence.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/aisequence.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 43a0f25c62..b6e1b124c6 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -1,7 +1,7 @@
 #include "aifollow.hpp"
 
-#include <components/esm/aisequence.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/aisequence.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index b1f4355a39..e8e03daad6 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -1,7 +1,7 @@
 #include "aipackage.hpp"
 
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 2d896ddbdc..3343b3cec0 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -1,6 +1,6 @@
 #include "aipursue.hpp"
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 545ec7f140..2cb18f1e78 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -3,7 +3,7 @@
 #include <limits>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "aipackage.hpp"
 #include "aistate.hpp"
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 77f6b2f7c0..853509ed80 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -7,7 +7,7 @@
 #include "aistate.hpp"
 #include "aipackagetypeid.hpp"
 
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 0b4a1411eb..d420771bd4 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 664ae105f3..c2f0beb179 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -4,7 +4,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
-#include <components/esm/aisequence.hpp>
+#include <components/esm3/aisequence.hpp>
 #include <components/detournavigator/navigatorutils.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 61fec3b543..f513554c12 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -9,10 +9,10 @@
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm/loadskil.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index d23f978ead..8c91a81177 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <set>
 
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/effectlist.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 570547e0d9..03c2d3f41f 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -2,9 +2,9 @@
 
 #include <algorithm>
 
-#include <components/esm/creaturestats.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/creaturestats.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 0543a31ba2..002991e004 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -14,7 +14,7 @@
 #include "drawstate.hpp"
 
 #include <components/esm/attr.hpp>
-#include <components/esm/magiceffects.hpp>
+#include <components/esm3/magiceffects.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index 256c5dad48..5e1a6fa239 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <components/esm/effectlist.hpp>
-#include <components/esm/loadench.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index e9e0be397e..d4b89c56d0 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -3,8 +3,8 @@
 #include <cmath>
 #include <stdexcept>
 
-#include <components/esm/effectlist.hpp>
-#include <components/esm/magiceffects.hpp>
+#include <components/esm3/effectlist.hpp>
+#include <components/esm3/magiceffects.hpp>
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e0d2da497b..0816445271 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -4,8 +4,8 @@
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/stolenitems.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/stolenitems.hpp>
 
 #include <components/detournavigator/navigator.hpp>
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 1d1dfacce8..ef49381eff 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -2,10 +2,10 @@
 
 #include <iomanip>
 
-#include <components/esm/loadclas.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadfact.hpp>
-#include <components/esm/npcstats.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/npcstats.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 9125eb527b..2b5157b4ec 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -1,7 +1,7 @@
 #include "objects.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadcont.hpp>
+#include <components/esm3/loadcont.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index f0a5040334..17b355682a 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -9,7 +9,7 @@
 #include <components/detournavigator/areatype.hpp>
 #include <components/detournavigator/status.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwmechanics/pathgrid.hpp b/apps/openmw/mwmechanics/pathgrid.hpp
index 050504617e..dfe958e745 100644
--- a/apps/openmw/mwmechanics/pathgrid.hpp
+++ b/apps/openmw/mwmechanics/pathgrid.hpp
@@ -3,7 +3,7 @@
 
 #include <deque>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 4d9cc3a7de..8dfd2b3f0c 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -1,8 +1,8 @@
 #ifndef MWMECHANICS_SPELLCASTING_H
 #define MWMECHANICS_SPELLCASTING_H
 
-#include <components/esm/activespells.hpp>
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/activespells.hpp>
+#include <components/esm3/effectlist.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 7e5f89b39b..95ed3ca06e 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/loadmgef.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index 9328d533e3..f90bb22f05 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "spells.hpp"
 
diff --git a/apps/openmw/mwmechanics/spelllist.hpp b/apps/openmw/mwmechanics/spelllist.hpp
index f5759fd7ee..b43a0bf14f 100644
--- a/apps/openmw/mwmechanics/spelllist.hpp
+++ b/apps/openmw/mwmechanics/spelllist.hpp
@@ -7,7 +7,7 @@
 #include <set>
 #include <vector>
 
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadspel.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index b79af49b05..0f44ee7d07 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -1,9 +1,9 @@
 #include "spellpriority.hpp"
 #include "weaponpriority.hpp"
 
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadspel.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 6520ae3ab3..133fc5e931 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -1,8 +1,8 @@
 #include "spells.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadspel.hpp>
-#include <components/esm/spellstate.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/spellstate.hpp>
 #include <components/misc/rng.hpp>
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/openmw/mwmechanics/spellutil.hpp b/apps/openmw/mwmechanics/spellutil.hpp
index bcc531087c..571e02d166 100644
--- a/apps/openmw/mwmechanics/spellutil.hpp
+++ b/apps/openmw/mwmechanics/spellutil.hpp
@@ -1,7 +1,7 @@
 #ifndef MWMECHANICS_SPELLUTIL_H
 #define MWMECHANICS_SPELLUTIL_H
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index ee484f5afd..b5285330df 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -1,6 +1,6 @@
 #include "stat.hpp"
 
-#include <components/esm/statstate.hpp>
+#include <components/esm3/statstate.hpp>
 
 namespace MWMechanics
 {
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 3186eef986..091ee98185 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -5,7 +5,7 @@
 
 #include "../mwworld/ptr.hpp"
 
-#include <components/esm/magiceffects.hpp>
+#include <components/esm3/magiceffects.hpp>
 
 #include "magiceffects.hpp"
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 1a17cc87e6..024d837fe7 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -1,6 +1,6 @@
 #include "weaponpriority.hpp"
 
-#include <components/esm/loadench.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index 2f2abca487..fd8a7f2b05 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -5,7 +5,7 @@
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/CollisionShapes/btConvexShape.h>
 
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/misc/convert.hpp>
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 98e3bcf737..195af630f5 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -22,7 +22,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadgmst.hpp>
+#include <components/esm3/loadgmst.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/misc/convert.hpp>
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 25a9904e26..88e1d10d81 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -5,8 +5,8 @@
 #include <osg/Group>
 #include <osg/Vec4f>
 
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index 808ff0801d..0d7c1959c3 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -6,7 +6,7 @@
 
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 50dfb68008..627b200b71 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -2,7 +2,7 @@
 
 #include <osg/MatrixTransform>
 
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadcrea.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
diff --git a/apps/openmw/mwrender/fogmanager.cpp b/apps/openmw/mwrender/fogmanager.cpp
index b151882922..b68b846851 100644
--- a/apps/openmw/mwrender/fogmanager.cpp
+++ b/apps/openmw/mwrender/fogmanager.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index ba8749d81c..5da79ec037 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -17,7 +17,7 @@
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/sceneutil/depth.hpp>
 
-#include <components/esm/globalmap.hpp>
+#include <components/esm3/globalmap.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index a39e31bb4d..a25ff004c0 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -7,7 +7,7 @@
 #include <osg/VertexAttribDivisor>
 #include <osg/Program>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/nodecallback.hpp>
 #include <components/terrain/quadtreenode.hpp>
diff --git a/apps/openmw/mwrender/groundcover.hpp b/apps/openmw/mwrender/groundcover.hpp
index 26ed8530aa..d6d3ac52a7 100644
--- a/apps/openmw/mwrender/groundcover.hpp
+++ b/apps/openmw/mwrender/groundcover.hpp
@@ -3,7 +3,7 @@
 
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index d9982d35c3..202420fee6 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -12,8 +12,8 @@
 #include <osgDB/ReadFile>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/fogstate.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/fogstate.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 756769bc7d..4748491dd4 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -9,7 +9,7 @@
 #include <osg/Material>
 #include <osgUtil/IncrementalCompileOperation>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/optimizer.hpp>
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index c24cdf4f8d..940760ff6c 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -3,7 +3,7 @@
 
 #include <components/terrain/quadtreeworld.hpp>
 #include <components/resource/resourcemanager.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <mutex>
 
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index 42d9150811..ec7d2c15e0 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -6,7 +6,7 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/Group>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 #include <components/sceneutil/pathgridutil.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/misc/coordinateconverter.hpp>
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 1925494ccd..7416ec988a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -43,7 +43,7 @@
 #include <components/terrain/terraingrid.hpp>
 #include <components/terrain/quadtreeworld.hpp>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/detournavigator/navigator.hpp>
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index fd5cbe0f79..47e60245ba 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -38,7 +38,7 @@
 
 #include <components/shader/shadermanager.hpp>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/fallback/fallback.hpp>
 
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 983365e06a..72537d606b 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -2,7 +2,7 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <components/esm/loaddial.hpp>
+#include <components/esm3/loaddial.hpp>
 
 #include <components/compiler/locals.hpp>
 
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 501404e958..b20e73957b 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -13,7 +13,7 @@
 
 #include <components/misc/stringops.hpp>
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 9de08fbce3..680fd145a0 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/stringops.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/globalscript.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/globalscript.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index b4c8d102c5..4c395f83d4 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -1,9 +1,9 @@
 #include "locals.hpp"
 #include "globalscripts.hpp"
 
-#include <components/esm/loadscpt.hpp>
-#include <components/esm/variant.hpp>
-#include <components/esm/locals.hpp>
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/esm3/locals.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/compiler/locals.hpp>
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 5d9f037357..f2c603089c 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -18,8 +18,8 @@
 
 #include <components/resource/resourcesystem.hpp>
 
-#include <components/esm/loadmgef.hpp>
-#include <components/esm/loadcrea.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include <components/vfs/manager.hpp>
 
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 2027c9e606..7efb5148fa 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -7,7 +7,7 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/loadscpt.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include <components/misc/stringops.hpp>
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 186d1edf26..1697a26e86 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 8a159a5685..ec43364e38 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -2,7 +2,7 @@
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/compiler/opcodes.hpp>
 
diff --git a/apps/openmw/mwsound/watersoundupdater.cpp b/apps/openmw/mwsound/watersoundupdater.cpp
index b1646c404f..4ef9bfffc4 100644
--- a/apps/openmw/mwsound/watersoundupdater.cpp
+++ b/apps/openmw/mwsound/watersoundupdater.cpp
@@ -4,7 +4,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/ptr.hpp"
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <osg/Vec3f>
 
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index 52696de104..2d82602534 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -5,7 +5,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
 
 #include <components/misc/utf8stream.hpp>
diff --git a/apps/openmw/mwstate/character.hpp b/apps/openmw/mwstate/character.hpp
index e12de9ca64..2ecd888a7b 100644
--- a/apps/openmw/mwstate/character.hpp
+++ b/apps/openmw/mwstate/character.hpp
@@ -3,7 +3,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include <components/esm/savedgame.hpp>
+#include <components/esm3/savedgame.hpp>
 
 namespace MWState
 {
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index b9825a0f90..db7ca19ff8 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -2,10 +2,10 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/cellid.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index ef435cca92..a1f568383b 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -1,6 +1,6 @@
 #include "actioneat.hpp"
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 
 #include "../mwworld/containerstore.hpp"
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index fc09a6e9a8..cdf1986383 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -12,7 +12,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/terrain/world.hpp>
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/loadinglistener/reporter.hpp>
 
 #include "../mwrender/landmanager.hpp"
diff --git a/apps/openmw/mwworld/cellref.cpp b/apps/openmw/mwworld/cellref.cpp
index 2f4702b1eb..2e1d64c441 100644
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@@ -3,7 +3,7 @@
 #include <assert.h>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/objectstate.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index b5e80930ed..507544f1c9 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWWORLD_CELLREF_H
 #define OPENMW_MWWORLD_CELLREF_H
 
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index d020eace45..9f5e4ffbbc 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -1,11 +1,11 @@
 #include "cells.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/cellstate.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 0c871e4f58..92836be72a 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -5,18 +5,18 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/cellstate.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/cellref.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/objectstate.hpp>
-#include <components/esm/containerstate.hpp>
-#include <components/esm/npcstate.hpp>
-#include <components/esm/creaturestate.hpp>
-#include <components/esm/fogstate.hpp>
-#include <components/esm/creaturelevliststate.hpp>
-#include <components/esm/doorstate.hpp>
+#include <components/esm3/cellstate.hpp>
+#include <components/esm3/cellid.hpp>
+#include <components/esm3/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/objectstate.hpp>
+#include <components/esm3/containerstate.hpp>
+#include <components/esm3/npcstate.hpp>
+#include <components/esm3/creaturestate.hpp>
+#include <components/esm3/fogstate.hpp>
+#include <components/esm3/creaturelevliststate.hpp>
+#include <components/esm3/doorstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index d284a291a5..551924857b 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -11,26 +11,26 @@
 #include "livecellref.hpp"
 #include "cellreflist.hpp"
 
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loadcrea.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlevlist.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/loadweap.hpp>
-#include <components/esm/loadnpc.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadbody.hpp>
 
 #include "timestamp.hpp"
 #include "ptr.hpp"
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 112f56abfc..0850f9c40f 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -4,7 +4,7 @@
 #include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/inventorystate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index f18a595466..cf9bc533e0 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -6,18 +6,18 @@
 #include <memory>
 #include <utility>
 
-#include <components/esm/loadalch.hpp>
-#include <components/esm/loadappa.hpp>
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbook.hpp>
-#include <components/esm/loadclot.hpp>
-#include <components/esm/loadingr.hpp>
-#include <components/esm/loadlock.hpp>
-#include <components/esm/loadligh.hpp>
-#include <components/esm/loadmisc.hpp>
-#include <components/esm/loadprob.hpp>
-#include <components/esm/loadrepa.hpp>
-#include <components/esm/loadweap.hpp>
+#include <components/esm3/loadalch.hpp>
+#include <components/esm3/loadappa.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include <components/misc/rng.hpp>
 
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index de16e386f2..8369523dca 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -1,7 +1,7 @@
 #include "esmloader.hpp"
 #include "esmstore.hpp"
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 1284df694a..695c5636c0 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -5,8 +5,8 @@
 #include <set>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index 8a481334e8..cb1d26cb71 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -2,8 +2,8 @@
 
 #include <stdexcept>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "esmstore.hpp"
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index ae5e412c70..5b414971f6 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <components/esm/loadglob.hpp>
+#include <components/esm3/loadglob.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index 197be2a998..6c48a63c58 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <map>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/files/collections.hpp>
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 8cb0b9b012..27a21e3362 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -4,8 +4,8 @@
 #include <algorithm>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadench.hpp>
-#include <components/esm/inventorystate.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/inventorystate.hpp>
 #include <components/misc/rng.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 62c9f3a2f0..ad9cdabb38 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -1,7 +1,7 @@
 #include "livecellref.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/objectstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 7d7e2857fe..9c257d9093 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -1,7 +1,7 @@
 #include "magiceffects.hpp"
 #include "esmstore.hpp"
 
-#include <components/esm/npcstate.hpp>
+#include <components/esm3/npcstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 270889a23e..8d0724e39e 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -4,11 +4,11 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/player.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/player.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/loadbsgn.hpp>
+#include <components/esm3/loadbsgn.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 1a9744e8a3..2770042969 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -9,9 +9,9 @@
 #include "../mwmechanics/drawstate.hpp"
 #include "../mwmechanics/stat.hpp"
 
-#include <components/esm/loadskil.hpp>
+#include <components/esm3/loadskil.hpp>
 #include <components/esm/attr.hpp>
-#include <components/esm/loadnpc.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 namespace ESM
 {
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3bff1854a6..5e60154a89 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -8,8 +8,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/projectilestate.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/projectilestate.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index f889250e1d..63a0dacc71 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -6,7 +6,7 @@
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 
-#include <components/esm/effectlist.hpp>
+#include <components/esm3/effectlist.hpp>
 
 #include "../mwbase/soundmanager.hpp"
 
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index e8c5ba35e4..10c65bd17c 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -1,6 +1,6 @@
 #include "refdata.hpp"
 
-#include <components/esm/objectstate.hpp>
+#include <components/esm3/objectstate.hpp>
 
 #include "customdata.hpp"
 #include "cellstore.hpp"
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index c98eb0f2af..0bc6df52a5 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -2,7 +2,7 @@
 #define GAME_MWWORLD_REFDATA_H
 
 #include <components/esm/defs.hpp>
-#include <components/esm/animationstate.hpp>
+#include <components/esm3/animationstate.hpp>
 
 #include "../mwscript/locals.hpp"
 #include "../mwworld/customdata.hpp"
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index c767bd669a..d35746dfff 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/rng.hpp>
@@ -433,7 +433,7 @@ namespace MWWorld
         return search(cell.mName);
     }
 
-    // this method *must* be called right after esm.loadCell()
+    // this method *must* be called right after esm3.loadCell()
     void Store<ESM::Cell>::handleMovedCellRefs(ESM::ESMReader& esm, ESM::Cell* cell)
     {
         ESM::CellRef ref;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 965c690238..e2b75edc40 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -2,9 +2,9 @@
 
 #include <components/misc/rng.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/weatherstate.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/weatherstate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 501378d7cc..1aebe94b87 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -11,10 +11,10 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/cellid.hpp>
+#include <components/esm3/cellref.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/mathutil.hpp>
diff --git a/apps/openmw_test_suite/detournavigator/navigator.cpp b/apps/openmw_test_suite/detournavigator/navigator.cpp
index e7cd0a7db0..09a2be58ee 100644
--- a/apps/openmw_test_suite/detournavigator/navigator.cpp
+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp
@@ -7,7 +7,7 @@
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/misc/rng.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/bullethelpers/heightfield.hpp>
 
diff --git a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
index feadc2f59d..ba008f50ff 100644
--- a/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
+++ b/apps/openmw_test_suite/detournavigator/navmeshdb.cpp
@@ -1,7 +1,7 @@
 #include "generate.hpp"
 
 #include <components/detournavigator/navmeshdb.hpp>
-#include <components/esm/cellid.hpp>
+#include <components/esm3/cellid.hpp>
 
 #include <DetourAlloc.h>
 
diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
index 36e0287461..b86fe7616b 100644
--- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
@@ -3,7 +3,7 @@
 #include <components/detournavigator/recastmeshbuilder.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/exceptions.hpp>
-#include <components/esm/loadland.hpp>
+#include <components/esm3/loadland.hpp>
 #include <components/misc/convert.hpp>
 #include <components/debug/debuglog.hpp>
 
diff --git a/apps/openmw_test_suite/esm/variant.cpp b/apps/openmw_test_suite/esm/variant.cpp
index 10d35e486c..6991a8b4a8 100644
--- a/apps/openmw_test_suite/esm/variant.cpp
+++ b/apps/openmw_test_suite/esm/variant.cpp
@@ -1,7 +1,7 @@
-#include <components/esm/variant.hpp>
-#include <components/esm/esmwriter.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadglob.hpp>
+#include <components/esm3/variant.hpp>
+#include <components/esm3/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadglob.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 7ddab538c4..10003cfdfd 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -3,8 +3,8 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <components/files/configurationmanager.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/stringops.hpp>
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 89b27b0d94..1f70091247 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -76,15 +76,18 @@ add_component_dir (to_utf8
     to_utf8
     )
 
-add_component_dir (esm
-    attr defs esmcommon esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
+add_component_dir(esm attr defs esmcommon records util luascripts)
+
+add_component_dir (esm3
+    esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
     loadclas loadclot loadcont loadcrea loaddial loaddoor loadench loadfact loadglob loadgmst
     loadinfo loadingr loadland loadlevlist loadligh loadlock loadprob loadrepa loadltex loadmgef loadmisc
     loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat
-    loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
-    savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap inventorystate containerstate npcstate creaturestate dialoguestate statstate
-    npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
-    aisequence magiceffects util custommarkerstate stolenitems transport animationstate controlsstate mappings luascripts
+    loadweap aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
+    savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap
+    inventorystate containerstate npcstate creaturestate dialoguestate statstate npcstats creaturestats
+    weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate debugprofile
+    aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings
     )
 
 add_component_dir (esmterrain
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index 8717a6839b..2b4bce5faf 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -465,7 +465,7 @@ bool Config::GameSettings::hasMaster()
     QStringList content = mSettings.values(QString(Config::GameSettings::sContentKey));
     for (int i = 0; i < content.count(); ++i) 
     {
-        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive)) 
+        if (content.at(i).endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive) || content.at(i).endsWith(QLatin1String(".esm"), Qt::CaseInsensitive))
         {
             result = true;
             break;
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 199799025a..57dfe0f87e 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -8,7 +8,7 @@
 #include <QTextCodec>
 #include <QDebug>
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon, bool showOMWScripts) :
     QAbstractTableModel(parent),
diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp
index 46a7c96008..c6223128a4 100644
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@@ -66,7 +66,7 @@ QByteArray ContentSelectorModel::EsmFile::encodedData() const
 bool ContentSelectorModel::EsmFile::isGameFile() const
 { 
     return (mGameFiles.size() == 0) &&
-        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) || 
+        (mFileName.endsWith(QLatin1String(".esm"), Qt::CaseInsensitive) ||
         mFileName.endsWith(QLatin1String(".omwgame"), Qt::CaseInsensitive));
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 85d86e6b2b..0a898665a0 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -3,7 +3,7 @@
 #include "settingsutils.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 #include <components/misc/coordinateconverter.hpp>
 
 namespace DetourNavigator
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 53beb02d82..17c5e2843a 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -1,7 +1,7 @@
 #include "luascripts.hpp"
 
-#include "esmreader.hpp"
-#include "esmwriter.hpp"
+#include "components/esm3/esmreader.hpp"
+#include "components/esm3/esmwriter.hpp"
 
 // List of all records, that are related to Lua.
 //
diff --git a/components/esm/records.hpp b/components/esm/records.hpp
index 5c183b6f6d..50d2f90263 100644
--- a/components/esm/records.hpp
+++ b/components/esm/records.hpp
@@ -2,48 +2,48 @@
 #define OPENMW_ESM_RECORDS_H
 
 #include "defs.hpp"
-#include "loadacti.hpp"
-#include "loadalch.hpp"
-#include "loadappa.hpp"
-#include "loadarmo.hpp"
-#include "loadbody.hpp"
-#include "loadbook.hpp"
-#include "loadbsgn.hpp"
-#include "loadcell.hpp"
-#include "loadclas.hpp"
-#include "loadclot.hpp"
-#include "loadcont.hpp"
-#include "loadcrea.hpp"
-#include "loadinfo.hpp"
-#include "loaddial.hpp"
-#include "loaddoor.hpp"
-#include "loadench.hpp"
-#include "loadfact.hpp"
-#include "loadglob.hpp"
-#include "loadgmst.hpp"
-#include "loadingr.hpp"
-#include "loadland.hpp"
-#include "loadlevlist.hpp"
-#include "loadligh.hpp"
-#include "loadlock.hpp"
-#include "loadrepa.hpp"
-#include "loadprob.hpp"
-#include "loadltex.hpp"
-#include "loadmgef.hpp"
-#include "loadmisc.hpp"
-#include "loadnpc.hpp"
-#include "loadpgrd.hpp"
-#include "loadrace.hpp"
-#include "loadregn.hpp"
-#include "loadscpt.hpp"
-#include "loadskil.hpp"
-#include "loadsndg.hpp"
-#include "loadsoun.hpp"
-#include "loadspel.hpp"
-#include "loadsscr.hpp"
-#include "loadstat.hpp"
-#include "loadweap.hpp"
+#include "components/esm3/loadacti.hpp"
+#include "components/esm3/loadalch.hpp"
+#include "components/esm3/loadappa.hpp"
+#include "components/esm3/loadarmo.hpp"
+#include "components/esm3/loadbody.hpp"
+#include "components/esm3/loadbook.hpp"
+#include "components/esm3/loadbsgn.hpp"
+#include "components/esm3/loadcell.hpp"
+#include "components/esm3/loadclas.hpp"
+#include "components/esm3/loadclot.hpp"
+#include "components/esm3/loadcont.hpp"
+#include "components/esm3/loadcrea.hpp"
+#include "components/esm3/loadinfo.hpp"
+#include "components/esm3/loaddial.hpp"
+#include "components/esm3/loaddoor.hpp"
+#include "components/esm3/loadench.hpp"
+#include "components/esm3/loadfact.hpp"
+#include "components/esm3/loadglob.hpp"
+#include "components/esm3/loadgmst.hpp"
+#include "components/esm3/loadingr.hpp"
+#include "components/esm3/loadland.hpp"
+#include "components/esm3/loadlevlist.hpp"
+#include "components/esm3/loadligh.hpp"
+#include "components/esm3/loadlock.hpp"
+#include "components/esm3/loadrepa.hpp"
+#include "components/esm3/loadprob.hpp"
+#include "components/esm3/loadltex.hpp"
+#include "components/esm3/loadmgef.hpp"
+#include "components/esm3/loadmisc.hpp"
+#include "components/esm3/loadnpc.hpp"
+#include "components/esm3/loadpgrd.hpp"
+#include "components/esm3/loadrace.hpp"
+#include "components/esm3/loadregn.hpp"
+#include "components/esm3/loadscpt.hpp"
+#include "components/esm3/loadskil.hpp"
+#include "components/esm3/loadsndg.hpp"
+#include "components/esm3/loadsoun.hpp"
+#include "components/esm3/loadspel.hpp"
+#include "components/esm3/loadsscr.hpp"
+#include "components/esm3/loadstat.hpp"
+#include "components/esm3/loadweap.hpp"
 
 // Special records which are not loaded from ESM
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 #endif
diff --git a/components/esm/activespells.cpp b/components/esm3/activespells.cpp
index 22f862b6e4..22f862b6e4 100644
--- a/components/esm/activespells.cpp
+++ b/components/esm3/activespells.cpp
diff --git a/components/esm/activespells.hpp b/components/esm3/activespells.hpp
index a79366f9c2..91b3f495f5 100644
--- a/components/esm/activespells.hpp
+++ b/components/esm3/activespells.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_ESM_ACTIVESPELLS_H
 
 #include "cellref.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "effectlist.hpp"
 
 #include <string>
diff --git a/components/esm/aipackage.cpp b/components/esm3/aipackage.cpp
index fa20d271c0..fa20d271c0 100644
--- a/components/esm/aipackage.cpp
+++ b/components/esm3/aipackage.cpp
diff --git a/components/esm/aipackage.hpp b/components/esm3/aipackage.hpp
index 6993867da1..90e1d1cf9e 100644
--- a/components/esm/aipackage.hpp
+++ b/components/esm3/aipackage.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/aisequence.cpp b/components/esm3/aisequence.cpp
index b99cac3ade..b99cac3ade 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm3/aisequence.cpp
diff --git a/components/esm/aisequence.hpp b/components/esm3/aisequence.hpp
index 00c1316d9c..b5a003678b 100644
--- a/components/esm/aisequence.hpp
+++ b/components/esm3/aisequence.hpp
@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
-#include "util.hpp"
+#include "components/esm/util.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/animationstate.cpp b/components/esm3/animationstate.cpp
index 37ea0b186e..37ea0b186e 100644
--- a/components/esm/animationstate.cpp
+++ b/components/esm3/animationstate.cpp
diff --git a/components/esm/animationstate.hpp b/components/esm3/animationstate.hpp
index 2a19eff63a..2a19eff63a 100644
--- a/components/esm/animationstate.hpp
+++ b/components/esm3/animationstate.hpp
diff --git a/components/esm/cellid.cpp b/components/esm3/cellid.cpp
index ad91d30e04..ad91d30e04 100644
--- a/components/esm/cellid.cpp
+++ b/components/esm3/cellid.cpp
diff --git a/components/esm/cellid.hpp b/components/esm3/cellid.hpp
index a28b717945..a28b717945 100644
--- a/components/esm/cellid.hpp
+++ b/components/esm3/cellid.hpp
diff --git a/components/esm/cellref.cpp b/components/esm3/cellref.cpp
index 002a885d92..002a885d92 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm3/cellref.cpp
diff --git a/components/esm/cellref.hpp b/components/esm3/cellref.hpp
index 0013329ccc..55e4b700fc 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -4,7 +4,7 @@
 #include <limits>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/cellstate.cpp b/components/esm3/cellstate.cpp
index 83b130dcd9..83b130dcd9 100644
--- a/components/esm/cellstate.cpp
+++ b/components/esm3/cellstate.cpp
diff --git a/components/esm/cellstate.hpp b/components/esm3/cellstate.hpp
index 55c1e51550..9c0427f76b 100644
--- a/components/esm/cellstate.hpp
+++ b/components/esm3/cellstate.hpp
@@ -3,7 +3,7 @@
 
 #include "cellid.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/containerstate.cpp b/components/esm3/containerstate.cpp
index 301549d597..301549d597 100644
--- a/components/esm/containerstate.cpp
+++ b/components/esm3/containerstate.cpp
diff --git a/components/esm/containerstate.hpp b/components/esm3/containerstate.hpp
index 7f1afd077f..7f1afd077f 100644
--- a/components/esm/containerstate.hpp
+++ b/components/esm3/containerstate.hpp
diff --git a/components/esm/controlsstate.cpp b/components/esm3/controlsstate.cpp
index ae4e1dff16..ae4e1dff16 100644
--- a/components/esm/controlsstate.cpp
+++ b/components/esm3/controlsstate.cpp
diff --git a/components/esm/controlsstate.hpp b/components/esm3/controlsstate.hpp
index b9654ea1aa..b9654ea1aa 100644
--- a/components/esm/controlsstate.hpp
+++ b/components/esm3/controlsstate.hpp
diff --git a/components/esm/creaturelevliststate.cpp b/components/esm3/creaturelevliststate.cpp
index 21cc73b89c..21cc73b89c 100644
--- a/components/esm/creaturelevliststate.cpp
+++ b/components/esm3/creaturelevliststate.cpp
diff --git a/components/esm/creaturelevliststate.hpp b/components/esm3/creaturelevliststate.hpp
index 2ee9e511f3..2ee9e511f3 100644
--- a/components/esm/creaturelevliststate.hpp
+++ b/components/esm3/creaturelevliststate.hpp
diff --git a/components/esm/creaturestate.cpp b/components/esm3/creaturestate.cpp
index bffa4e5e45..bffa4e5e45 100644
--- a/components/esm/creaturestate.cpp
+++ b/components/esm3/creaturestate.cpp
diff --git a/components/esm/creaturestate.hpp b/components/esm3/creaturestate.hpp
index 4b4c59d719..4b4c59d719 100644
--- a/components/esm/creaturestate.hpp
+++ b/components/esm3/creaturestate.hpp
diff --git a/components/esm/creaturestats.cpp b/components/esm3/creaturestats.cpp
index 0f404ba58b..0f404ba58b 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm3/creaturestats.cpp
diff --git a/components/esm/creaturestats.hpp b/components/esm3/creaturestats.hpp
index 7b261e3dd3..d47a283630 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm3/creaturestats.hpp
@@ -7,9 +7,9 @@
 
 #include "statstate.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 #include "spellstate.hpp"
 #include "activespells.hpp"
 #include "magiceffects.hpp"
diff --git a/components/esm/custommarkerstate.cpp b/components/esm3/custommarkerstate.cpp
index dc81c123d4..dc81c123d4 100644
--- a/components/esm/custommarkerstate.cpp
+++ b/components/esm3/custommarkerstate.cpp
diff --git a/components/esm/custommarkerstate.hpp b/components/esm3/custommarkerstate.hpp
index 2be43c53bf..2be43c53bf 100644
--- a/components/esm/custommarkerstate.hpp
+++ b/components/esm3/custommarkerstate.hpp
diff --git a/components/esm/debugprofile.cpp b/components/esm3/debugprofile.cpp
index 090d2bfe6d..f862d4a289 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm3/debugprofile.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::DebugProfile::sRecordId = REC_DBGP;
 
diff --git a/components/esm/debugprofile.hpp b/components/esm3/debugprofile.hpp
index 8340404c23..8340404c23 100644
--- a/components/esm/debugprofile.hpp
+++ b/components/esm3/debugprofile.hpp
diff --git a/components/esm/dialoguestate.cpp b/components/esm3/dialoguestate.cpp
index 2b1887e4eb..2b1887e4eb 100644
--- a/components/esm/dialoguestate.cpp
+++ b/components/esm3/dialoguestate.cpp
diff --git a/components/esm/dialoguestate.hpp b/components/esm3/dialoguestate.hpp
index d7cdb941c2..d7cdb941c2 100644
--- a/components/esm/dialoguestate.hpp
+++ b/components/esm3/dialoguestate.hpp
diff --git a/components/esm/doorstate.cpp b/components/esm3/doorstate.cpp
index 4378bb2197..4378bb2197 100644
--- a/components/esm/doorstate.cpp
+++ b/components/esm3/doorstate.cpp
diff --git a/components/esm/doorstate.hpp b/components/esm3/doorstate.hpp
index c3aeb42e38..c3aeb42e38 100644
--- a/components/esm/doorstate.hpp
+++ b/components/esm3/doorstate.hpp
diff --git a/components/esm/effectlist.cpp b/components/esm3/effectlist.cpp
index f6d5a6e071..f6d5a6e071 100644
--- a/components/esm/effectlist.cpp
+++ b/components/esm3/effectlist.cpp
diff --git a/components/esm/effectlist.hpp b/components/esm3/effectlist.hpp
index d581f83371..d581f83371 100644
--- a/components/esm/effectlist.hpp
+++ b/components/esm3/effectlist.hpp
diff --git a/components/esm/esmreader.cpp b/components/esm3/esmreader.cpp
index 416e8a9be2..416e8a9be2 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm3/esmreader.cpp
diff --git a/components/esm/esmreader.hpp b/components/esm3/esmreader.hpp
index d7eb6ff0a1..3b384dc603 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@@ -12,7 +12,7 @@
 
 #include <components/to_utf8/to_utf8.hpp>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
 namespace ESM {
diff --git a/components/esm/esmwriter.cpp b/components/esm3/esmwriter.cpp
index f65340f703..f65340f703 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
diff --git a/components/esm/esmwriter.hpp b/components/esm3/esmwriter.hpp
index ba5800f67c..ed2ccbb377 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm3/esmwriter.hpp
@@ -4,7 +4,7 @@
 #include <iosfwd>
 #include <list>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "loadtes3.hpp"
 
 namespace ToUTF8
diff --git a/components/esm/filter.cpp b/components/esm3/filter.cpp
index 76a518c63d..03fa4ba278 100644
--- a/components/esm/filter.cpp
+++ b/components/esm3/filter.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::Filter::sRecordId = REC_FILT;
 
diff --git a/components/esm/filter.hpp b/components/esm3/filter.hpp
index 78d51cec00..78d51cec00 100644
--- a/components/esm/filter.hpp
+++ b/components/esm3/filter.hpp
diff --git a/components/esm/fogstate.cpp b/components/esm3/fogstate.cpp
index ff20f339f9..ff20f339f9 100644
--- a/components/esm/fogstate.cpp
+++ b/components/esm3/fogstate.cpp
diff --git a/components/esm/fogstate.hpp b/components/esm3/fogstate.hpp
index 4a5619e518..4a5619e518 100644
--- a/components/esm/fogstate.hpp
+++ b/components/esm3/fogstate.hpp
diff --git a/components/esm/globalmap.cpp b/components/esm3/globalmap.cpp
index 190329c61e..3005349d26 100644
--- a/components/esm/globalmap.cpp
+++ b/components/esm3/globalmap.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 unsigned int ESM::GlobalMap::sRecordId = ESM::REC_GMAP;
 
diff --git a/components/esm/globalmap.hpp b/components/esm3/globalmap.hpp
index e89123f898..e89123f898 100644
--- a/components/esm/globalmap.hpp
+++ b/components/esm3/globalmap.hpp
diff --git a/components/esm/globalscript.cpp b/components/esm3/globalscript.cpp
index a8a8e79cf5..a8a8e79cf5 100644
--- a/components/esm/globalscript.cpp
+++ b/components/esm3/globalscript.cpp
diff --git a/components/esm/globalscript.hpp b/components/esm3/globalscript.hpp
index 1a1a6cf4eb..1a1a6cf4eb 100644
--- a/components/esm/globalscript.hpp
+++ b/components/esm3/globalscript.hpp
diff --git a/components/esm/inventorystate.cpp b/components/esm3/inventorystate.cpp
index 980d67f7ef..980d67f7ef 100644
--- a/components/esm/inventorystate.cpp
+++ b/components/esm3/inventorystate.cpp
diff --git a/components/esm/inventorystate.hpp b/components/esm3/inventorystate.hpp
index f4bb0ab487..f4bb0ab487 100644
--- a/components/esm/inventorystate.hpp
+++ b/components/esm3/inventorystate.hpp
diff --git a/components/esm/journalentry.cpp b/components/esm3/journalentry.cpp
index 93011e581b..93011e581b 100644
--- a/components/esm/journalentry.cpp
+++ b/components/esm3/journalentry.cpp
diff --git a/components/esm/journalentry.hpp b/components/esm3/journalentry.hpp
index 76901a4b69..76901a4b69 100644
--- a/components/esm/journalentry.hpp
+++ b/components/esm3/journalentry.hpp
diff --git a/components/esm/loadacti.cpp b/components/esm3/loadacti.cpp
index fcb0954918..c4aa9cb6b8 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm3/loadacti.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadacti.hpp b/components/esm3/loadacti.hpp
index c0cf274ed9..c0cf274ed9 100644
--- a/components/esm/loadacti.hpp
+++ b/components/esm3/loadacti.hpp
diff --git a/components/esm/loadalch.cpp b/components/esm3/loadalch.cpp
index ad30570f74..618e116cce 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm3/loadalch.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadalch.hpp b/components/esm3/loadalch.hpp
index e032464abe..e032464abe 100644
--- a/components/esm/loadalch.hpp
+++ b/components/esm3/loadalch.hpp
diff --git a/components/esm/loadappa.cpp b/components/esm3/loadappa.cpp
index 1113870197..13ba0fbb42 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm3/loadappa.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadappa.hpp b/components/esm3/loadappa.hpp
index 026a471f5b..026a471f5b 100644
--- a/components/esm/loadappa.hpp
+++ b/components/esm3/loadappa.hpp
diff --git a/components/esm/loadarmo.cpp b/components/esm3/loadarmo.cpp
index cab0d52a88..9c5164f8a6 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm3/loadarmo.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadarmo.hpp b/components/esm3/loadarmo.hpp
index f11e3509d5..f11e3509d5 100644
--- a/components/esm/loadarmo.hpp
+++ b/components/esm3/loadarmo.hpp
diff --git a/components/esm/loadbody.cpp b/components/esm3/loadbody.cpp
index c7f6bce40a..1098941c25 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm3/loadbody.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadbody.hpp b/components/esm3/loadbody.hpp
index 145fe4b6f6..145fe4b6f6 100644
--- a/components/esm/loadbody.hpp
+++ b/components/esm3/loadbody.hpp
diff --git a/components/esm/loadbook.cpp b/components/esm3/loadbook.cpp
index 07b9a6b50f..c03046ed9f 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm3/loadbook.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadbook.hpp b/components/esm3/loadbook.hpp
index e46bec6272..e46bec6272 100644
--- a/components/esm/loadbook.hpp
+++ b/components/esm3/loadbook.hpp
diff --git a/components/esm/loadbsgn.cpp b/components/esm3/loadbsgn.cpp
index d767eb66e0..d02fc93914 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm3/loadbsgn.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadbsgn.hpp b/components/esm3/loadbsgn.hpp
index a199503a76..a199503a76 100644
--- a/components/esm/loadbsgn.hpp
+++ b/components/esm3/loadbsgn.hpp
diff --git a/components/esm/loadcell.cpp b/components/esm3/loadcell.cpp
index b2c95ad25f..256be62898 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm3/loadcell.cpp
@@ -11,7 +11,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "cellid.hpp"
 
 namespace
diff --git a/components/esm/loadcell.hpp b/components/esm3/loadcell.hpp
index c2a694b744..61f9fb54a3 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm3/loadcell.hpp
@@ -5,8 +5,8 @@
 #include <vector>
 #include <list>
 
-#include "esmcommon.hpp"
-#include "defs.hpp"
+#include "components/esm/esmcommon.hpp"
+#include "components/esm/defs.hpp"
 #include "cellref.hpp"
 #include "cellid.hpp"
 
diff --git a/components/esm/loadclas.cpp b/components/esm3/loadclas.cpp
index c70f7dd0d3..0bd966e752 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm3/loadclas.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadclas.hpp b/components/esm3/loadclas.hpp
index e1e8b2ff0f..e1e8b2ff0f 100644
--- a/components/esm/loadclas.hpp
+++ b/components/esm3/loadclas.hpp
diff --git a/components/esm/loadclot.cpp b/components/esm3/loadclot.cpp
index 8f2aff40fc..05a895b0f4 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm3/loadclot.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadclot.hpp b/components/esm3/loadclot.hpp
index 26e82254ab..26e82254ab 100644
--- a/components/esm/loadclot.hpp
+++ b/components/esm3/loadclot.hpp
diff --git a/components/esm/loadcont.cpp b/components/esm3/loadcont.cpp
index b7757646a1..19bb649125 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm3/loadcont.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadcont.hpp b/components/esm3/loadcont.hpp
index eac791e3f3..a236f0a3e5 100644
--- a/components/esm/loadcont.hpp
+++ b/components/esm3/loadcont.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadcrea.cpp b/components/esm3/loadcrea.cpp
index 590a68bc35..1cec61b3ab 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm3/loadcrea.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM {
 
diff --git a/components/esm/loadcrea.hpp b/components/esm3/loadcrea.hpp
index 9d664d440e..9d664d440e 100644
--- a/components/esm/loadcrea.hpp
+++ b/components/esm3/loadcrea.hpp
diff --git a/components/esm/loaddial.cpp b/components/esm3/loaddial.cpp
index 535ea23380..67696be821 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm3/loaddial.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loaddial.hpp b/components/esm3/loaddial.hpp
index 7adc8b1cf8..7adc8b1cf8 100644
--- a/components/esm/loaddial.hpp
+++ b/components/esm3/loaddial.hpp
diff --git a/components/esm/loaddoor.cpp b/components/esm3/loaddoor.cpp
index d5bf51b4da..48fa0faaf3 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm3/loaddoor.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loaddoor.hpp b/components/esm3/loaddoor.hpp
index 84dbcbfa56..84dbcbfa56 100644
--- a/components/esm/loaddoor.hpp
+++ b/components/esm3/loaddoor.hpp
diff --git a/components/esm/loadench.cpp b/components/esm3/loadench.cpp
index db0727099c..fae0aa211b 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm3/loadench.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadench.hpp b/components/esm3/loadench.hpp
index 3f094f754c..3f094f754c 100644
--- a/components/esm/loadench.hpp
+++ b/components/esm3/loadench.hpp
diff --git a/components/esm/loadfact.cpp b/components/esm3/loadfact.cpp
index 61d0e1dcf4..554c30e40e 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm3/loadfact.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadfact.hpp b/components/esm3/loadfact.hpp
index da01c004e9..da01c004e9 100644
--- a/components/esm/loadfact.hpp
+++ b/components/esm3/loadfact.hpp
diff --git a/components/esm/loadglob.cpp b/components/esm3/loadglob.cpp
index d2226d1738..fd4ee05665 100644
--- a/components/esm/loadglob.cpp
+++ b/components/esm3/loadglob.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadglob.hpp b/components/esm3/loadglob.hpp
index 7fcbe4b8e6..7fcbe4b8e6 100644
--- a/components/esm/loadglob.hpp
+++ b/components/esm3/loadglob.hpp
diff --git a/components/esm/loadgmst.cpp b/components/esm3/loadgmst.cpp
index 6d4ac1b202..1bcf6a1fa4 100644
--- a/components/esm/loadgmst.cpp
+++ b/components/esm3/loadgmst.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadgmst.hpp b/components/esm3/loadgmst.hpp
index a3981736f1..a3981736f1 100644
--- a/components/esm/loadgmst.hpp
+++ b/components/esm3/loadgmst.hpp
diff --git a/components/esm/loadinfo.cpp b/components/esm3/loadinfo.cpp
index 6c54b0b9ab..5cc1f9a090 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm3/loadinfo.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadinfo.hpp b/components/esm3/loadinfo.hpp
index d68301c91b..7f135087ee 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm3/loadinfo.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "variant.hpp"
 
 namespace ESM
diff --git a/components/esm/loadingr.cpp b/components/esm3/loadingr.cpp
index 1aba000267..652e381881 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm3/loadingr.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadingr.hpp b/components/esm3/loadingr.hpp
index 2ee572123d..2ee572123d 100644
--- a/components/esm/loadingr.hpp
+++ b/components/esm3/loadingr.hpp
diff --git a/components/esm/loadland.cpp b/components/esm3/loadland.cpp
index e97ad6b759..24cac7f015 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm3/loadland.cpp
@@ -5,7 +5,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadland.hpp b/components/esm3/loadland.hpp
index 610dd28fb8..1244a955cf 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm3/loadland.hpp
@@ -5,7 +5,7 @@
 
 #include <components/misc/constants.hpp>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadlevlist.cpp b/components/esm3/loadlevlist.cpp
index acf97f4259..1de278761b 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm3/loadlevlist.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadlevlist.hpp b/components/esm3/loadlevlist.hpp
index 0ebd7a64cb..0ebd7a64cb 100644
--- a/components/esm/loadlevlist.hpp
+++ b/components/esm3/loadlevlist.hpp
diff --git a/components/esm/loadligh.cpp b/components/esm3/loadligh.cpp
index 32c0b16243..4e8c41fbb9 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm3/loadligh.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadligh.hpp b/components/esm3/loadligh.hpp
index 9bd608e4d9..9bd608e4d9 100644
--- a/components/esm/loadligh.hpp
+++ b/components/esm3/loadligh.hpp
diff --git a/components/esm/loadlock.cpp b/components/esm3/loadlock.cpp
index bea5c86773..10ac680ab5 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm3/loadlock.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadlock.hpp b/components/esm3/loadlock.hpp
index 4f8a3575fc..4f8a3575fc 100644
--- a/components/esm/loadlock.hpp
+++ b/components/esm3/loadlock.hpp
diff --git a/components/esm/loadltex.cpp b/components/esm3/loadltex.cpp
index f2a1e17d49..3d01c4fe17 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm3/loadltex.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadltex.hpp b/components/esm3/loadltex.hpp
index b2e937c01a..b2e937c01a 100644
--- a/components/esm/loadltex.hpp
+++ b/components/esm3/loadltex.hpp
diff --git a/components/esm/loadmgef.cpp b/components/esm3/loadmgef.cpp
index 7aff249aeb..e86907564c 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm3/loadmgef.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace
 {
diff --git a/components/esm/loadmgef.hpp b/components/esm3/loadmgef.hpp
index 00cadf99c0..00cadf99c0 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm3/loadmgef.hpp
diff --git a/components/esm/loadmisc.cpp b/components/esm3/loadmisc.cpp
index a60012e74b..0405382cfd 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm3/loadmisc.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadmisc.hpp b/components/esm3/loadmisc.hpp
index a0f46349a8..a0f46349a8 100644
--- a/components/esm/loadmisc.hpp
+++ b/components/esm3/loadmisc.hpp
diff --git a/components/esm/loadnpc.cpp b/components/esm3/loadnpc.cpp
index b86ea6f8bc..07ee560b54 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm3/loadnpc.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadnpc.hpp b/components/esm3/loadnpc.hpp
index f0354cb603..24752beb11 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm3/loadnpc.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 #include "loadcont.hpp"
 #include "aipackage.hpp"
 #include "spelllist.hpp"
diff --git a/components/esm/loadpgrd.cpp b/components/esm3/loadpgrd.cpp
index b10e3c453d..da90018619 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm3/loadpgrd.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadpgrd.hpp b/components/esm3/loadpgrd.hpp
index 02ce231fe3..02ce231fe3 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm3/loadpgrd.hpp
diff --git a/components/esm/loadprob.cpp b/components/esm3/loadprob.cpp
index edc6b89cd1..644abb6a39 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm3/loadprob.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadprob.hpp b/components/esm3/loadprob.hpp
index 583aa24523..583aa24523 100644
--- a/components/esm/loadprob.hpp
+++ b/components/esm3/loadprob.hpp
diff --git a/components/esm/loadrace.cpp b/components/esm3/loadrace.cpp
index 35ad4421f1..092d064cd8 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm3/loadrace.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadrace.hpp b/components/esm3/loadrace.hpp
index ba42261e73..ba42261e73 100644
--- a/components/esm/loadrace.hpp
+++ b/components/esm3/loadrace.hpp
diff --git a/components/esm/loadregn.cpp b/components/esm3/loadregn.cpp
index 9cfdaaabc0..9e8921e939 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm3/loadregn.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadregn.hpp b/components/esm3/loadregn.hpp
index 64991c9b3a..7944f69cfe 100644
--- a/components/esm/loadregn.hpp
+++ b/components/esm3/loadregn.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadrepa.cpp b/components/esm3/loadrepa.cpp
index 3fe62e740a..f7349256f0 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm3/loadrepa.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadrepa.hpp b/components/esm3/loadrepa.hpp
index c3b2a076af..c3b2a076af 100644
--- a/components/esm/loadrepa.hpp
+++ b/components/esm3/loadrepa.hpp
diff --git a/components/esm/loadscpt.cpp b/components/esm3/loadscpt.cpp
index 76cb3c0149..dfbcc1c7f1 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm3/loadscpt.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadscpt.hpp b/components/esm3/loadscpt.hpp
index f737698184..d40a571ec6 100644
--- a/components/esm/loadscpt.hpp
+++ b/components/esm3/loadscpt.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadskil.cpp b/components/esm3/loadskil.cpp
index 9236302dea..5843b3ddb5 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -4,7 +4,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadskil.hpp b/components/esm3/loadskil.hpp
index 404ef06692..cd4cad6a71 100644
--- a/components/esm/loadskil.hpp
+++ b/components/esm3/loadskil.hpp
@@ -4,7 +4,7 @@
 #include <array>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM {
 
diff --git a/components/esm/loadsndg.cpp b/components/esm3/loadsndg.cpp
index c1170b36c7..17423a061b 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm3/loadsndg.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadsndg.hpp b/components/esm3/loadsndg.hpp
index 565a29b156..565a29b156 100644
--- a/components/esm/loadsndg.hpp
+++ b/components/esm3/loadsndg.hpp
diff --git a/components/esm/loadsoun.cpp b/components/esm3/loadsoun.cpp
index 9d58e19e99..109d732da5 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm3/loadsoun.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadsoun.hpp b/components/esm3/loadsoun.hpp
index 4149a34b7d..4149a34b7d 100644
--- a/components/esm/loadsoun.hpp
+++ b/components/esm3/loadsoun.hpp
diff --git a/components/esm/loadspel.cpp b/components/esm3/loadspel.cpp
index cc26024426..d113cdd194 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm3/loadspel.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadspel.hpp b/components/esm3/loadspel.hpp
index 6a2d02d286..6a2d02d286 100644
--- a/components/esm/loadspel.hpp
+++ b/components/esm3/loadspel.hpp
diff --git a/components/esm/loadsscr.cpp b/components/esm3/loadsscr.cpp
index 723fb3bf10..59d6eab58e 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm3/loadsscr.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadsscr.hpp b/components/esm3/loadsscr.hpp
index 277c4eb731..277c4eb731 100644
--- a/components/esm/loadsscr.hpp
+++ b/components/esm3/loadsscr.hpp
diff --git a/components/esm/loadstat.cpp b/components/esm3/loadstat.cpp
index e0c9eb2c7e..a4941f0895 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm3/loadstat.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadstat.hpp b/components/esm3/loadstat.hpp
index 26d8fda3a8..26d8fda3a8 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm3/loadstat.hpp
diff --git a/components/esm/loadtes3.cpp b/components/esm3/loadtes3.cpp
index f5cbcd62f2..e39d65298c 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm3/loadtes3.cpp
@@ -1,9 +1,9 @@
 #include "loadtes3.hpp"
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 void ESM::Header::blank()
 {
diff --git a/components/esm/loadtes3.hpp b/components/esm3/loadtes3.hpp
index 014e2a1362..8f5ed68413 100644
--- a/components/esm/loadtes3.hpp
+++ b/components/esm3/loadtes3.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "esmcommon.hpp"
+#include "components/esm/esmcommon.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadweap.cpp b/components/esm3/loadweap.cpp
index 08c5a3b641..e109096e09 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm3/loadweap.cpp
@@ -2,7 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/loadweap.hpp b/components/esm3/loadweap.hpp
index 98ba57b8b8..98ba57b8b8 100644
--- a/components/esm/loadweap.hpp
+++ b/components/esm3/loadweap.hpp
diff --git a/components/esm/locals.cpp b/components/esm3/locals.cpp
index 4149695fe9..4149695fe9 100644
--- a/components/esm/locals.cpp
+++ b/components/esm3/locals.cpp
diff --git a/components/esm/locals.hpp b/components/esm3/locals.hpp
index af5afb23bd..af5afb23bd 100644
--- a/components/esm/locals.hpp
+++ b/components/esm3/locals.hpp
diff --git a/components/esm/magiceffects.cpp b/components/esm3/magiceffects.cpp
index a1f943a93d..a1f943a93d 100644
--- a/components/esm/magiceffects.cpp
+++ b/components/esm3/magiceffects.cpp
diff --git a/components/esm/magiceffects.hpp b/components/esm3/magiceffects.hpp
index 4b54692c5f..4b54692c5f 100644
--- a/components/esm/magiceffects.hpp
+++ b/components/esm3/magiceffects.hpp
diff --git a/components/esm/mappings.cpp b/components/esm3/mappings.cpp
index 440e735739..440e735739 100644
--- a/components/esm/mappings.cpp
+++ b/components/esm3/mappings.cpp
diff --git a/components/esm/mappings.hpp b/components/esm3/mappings.hpp
index f930fef152..e2fa1b62c3 100644
--- a/components/esm/mappings.hpp
+++ b/components/esm3/mappings.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include <components/esm/loadarmo.hpp>
-#include <components/esm/loadbody.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadbody.hpp>
 
 namespace ESM
 {
diff --git a/components/esm/npcstate.cpp b/components/esm3/npcstate.cpp
index 6c9988d50d..6c9988d50d 100644
--- a/components/esm/npcstate.cpp
+++ b/components/esm3/npcstate.cpp
diff --git a/components/esm/npcstate.hpp b/components/esm3/npcstate.hpp
index fc6b917642..fc6b917642 100644
--- a/components/esm/npcstate.hpp
+++ b/components/esm3/npcstate.hpp
diff --git a/components/esm/npcstats.cpp b/components/esm3/npcstats.cpp
index 277335e8ca..277335e8ca 100644
--- a/components/esm/npcstats.cpp
+++ b/components/esm3/npcstats.cpp
diff --git a/components/esm/npcstats.hpp b/components/esm3/npcstats.hpp
index 3ad94b543e..3ad94b543e 100644
--- a/components/esm/npcstats.hpp
+++ b/components/esm3/npcstats.hpp
diff --git a/components/esm/objectstate.cpp b/components/esm3/objectstate.cpp
index 76967e497c..76967e497c 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm3/objectstate.cpp
diff --git a/components/esm/objectstate.hpp b/components/esm3/objectstate.hpp
index b30f44b5e1..eb09e2e854 100644
--- a/components/esm/objectstate.hpp
+++ b/components/esm3/objectstate.hpp
@@ -6,7 +6,7 @@
 
 #include "cellref.hpp"
 #include "locals.hpp"
-#include "luascripts.hpp"
+#include "components/esm/luascripts.hpp"
 #include "animationstate.hpp"
 
 namespace ESM
diff --git a/components/esm/player.cpp b/components/esm3/player.cpp
index 028a042809..028a042809 100644
--- a/components/esm/player.cpp
+++ b/components/esm3/player.cpp
diff --git a/components/esm/player.hpp b/components/esm3/player.hpp
index bea29cf74a..d69571705d 100644
--- a/components/esm/player.hpp
+++ b/components/esm3/player.hpp
@@ -5,10 +5,10 @@
 
 #include "npcstate.hpp"
 #include "cellid.hpp"
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 #include "loadskil.hpp"
-#include "attr.hpp"
+#include "components/esm/attr.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/projectilestate.cpp b/components/esm3/projectilestate.cpp
index 3421c19526..3421c19526 100644
--- a/components/esm/projectilestate.cpp
+++ b/components/esm3/projectilestate.cpp
diff --git a/components/esm/projectilestate.hpp b/components/esm3/projectilestate.hpp
index 84292813ce..2b2f0d137b 100644
--- a/components/esm/projectilestate.hpp
+++ b/components/esm3/projectilestate.hpp
@@ -8,7 +8,7 @@
 
 #include "effectlist.hpp"
 
-#include "util.hpp"
+#include "components/esm/util.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/queststate.cpp b/components/esm3/queststate.cpp
index 5408cd2ffd..5408cd2ffd 100644
--- a/components/esm/queststate.cpp
+++ b/components/esm3/queststate.cpp
diff --git a/components/esm/queststate.hpp b/components/esm3/queststate.hpp
index 4966cdc908..4966cdc908 100644
--- a/components/esm/queststate.hpp
+++ b/components/esm3/queststate.hpp
diff --git a/components/esm/quickkeys.cpp b/components/esm3/quickkeys.cpp
index 42cd91c5bc..42cd91c5bc 100644
--- a/components/esm/quickkeys.cpp
+++ b/components/esm3/quickkeys.cpp
diff --git a/components/esm/quickkeys.hpp b/components/esm3/quickkeys.hpp
index c52466b13e..c52466b13e 100644
--- a/components/esm/quickkeys.hpp
+++ b/components/esm3/quickkeys.hpp
diff --git a/components/esm/savedgame.cpp b/components/esm3/savedgame.cpp
index 6cecf26489..6cecf26489 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
diff --git a/components/esm/savedgame.hpp b/components/esm3/savedgame.hpp
index 26efae824e..46180bb704 100644
--- a/components/esm/savedgame.hpp
+++ b/components/esm3/savedgame.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/spelllist.cpp b/components/esm3/spelllist.cpp
index 71c7b340d2..71c7b340d2 100644
--- a/components/esm/spelllist.cpp
+++ b/components/esm3/spelllist.cpp
diff --git a/components/esm/spelllist.hpp b/components/esm3/spelllist.hpp
index 6fb0980659..6fb0980659 100644
--- a/components/esm/spelllist.hpp
+++ b/components/esm3/spelllist.hpp
diff --git a/components/esm/spellstate.cpp b/components/esm3/spellstate.cpp
index b1ddb6523c..b1ddb6523c 100644
--- a/components/esm/spellstate.cpp
+++ b/components/esm3/spellstate.cpp
diff --git a/components/esm/spellstate.hpp b/components/esm3/spellstate.hpp
index e7067dae8c..bb909c506c 100644
--- a/components/esm/spellstate.hpp
+++ b/components/esm3/spellstate.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <set>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/statstate.cpp b/components/esm3/statstate.cpp
index 30d39e3c67..30d39e3c67 100644
--- a/components/esm/statstate.cpp
+++ b/components/esm3/statstate.cpp
diff --git a/components/esm/statstate.hpp b/components/esm3/statstate.hpp
index d81d24a61f..d81d24a61f 100644
--- a/components/esm/statstate.hpp
+++ b/components/esm3/statstate.hpp
diff --git a/components/esm/stolenitems.cpp b/components/esm3/stolenitems.cpp
index c51b0b99b0..e196fc80c2 100644
--- a/components/esm/stolenitems.cpp
+++ b/components/esm3/stolenitems.cpp
@@ -1,7 +1,7 @@
 #include "stolenitems.hpp"
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 namespace ESM
 {
diff --git a/components/esm/stolenitems.hpp b/components/esm3/stolenitems.hpp
index 928fbbf757..928fbbf757 100644
--- a/components/esm/stolenitems.hpp
+++ b/components/esm3/stolenitems.hpp
diff --git a/components/esm/transport.cpp b/components/esm3/transport.cpp
index 9d40debf73..958ef6949a 100644
--- a/components/esm/transport.cpp
+++ b/components/esm3/transport.cpp
@@ -2,8 +2,8 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/esm/esmreader.hpp>
-#include <components/esm/esmwriter.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/esmwriter.hpp>
 
 namespace ESM
 {
diff --git a/components/esm/transport.hpp b/components/esm3/transport.hpp
index 10d4013f72..f1e5f2103b 100644
--- a/components/esm/transport.hpp
+++ b/components/esm3/transport.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace ESM
 {
diff --git a/components/esm/variant.cpp b/components/esm3/variant.cpp
index 830e13f3e4..a0f6ca7b41 100644
--- a/components/esm/variant.cpp
+++ b/components/esm3/variant.cpp
@@ -6,7 +6,7 @@
 #include "esmreader.hpp"
 #include "variantimp.hpp"
 
-#include "defs.hpp"
+#include "components/esm/defs.hpp"
 
 namespace
 {
diff --git a/components/esm/variant.hpp b/components/esm3/variant.hpp
index f0a16d4d53..f0a16d4d53 100644
--- a/components/esm/variant.hpp
+++ b/components/esm3/variant.hpp
diff --git a/components/esm/variantimp.cpp b/components/esm3/variantimp.cpp
index b9cd9a8536..b9cd9a8536 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm3/variantimp.cpp
diff --git a/components/esm/variantimp.hpp b/components/esm3/variantimp.hpp
index 9458728115..9458728115 100644
--- a/components/esm/variantimp.hpp
+++ b/components/esm3/variantimp.hpp
diff --git a/components/esm/weatherstate.cpp b/components/esm3/weatherstate.cpp
index cd1a82b0b7..cd1a82b0b7 100644
--- a/components/esm/weatherstate.cpp
+++ b/components/esm3/weatherstate.cpp
diff --git a/components/esm/weatherstate.hpp b/components/esm3/weatherstate.hpp
index 532a056ac0..532a056ac0 100644
--- a/components/esm/weatherstate.hpp
+++ b/components/esm3/weatherstate.hpp
diff --git a/components/esmloader/esmdata.cpp b/components/esmloader/esmdata.cpp
index bf2a8675d2..fd7d0f622c 100644
--- a/components/esmloader/esmdata.cpp
+++ b/components/esmloader/esmdata.cpp
@@ -3,13 +3,13 @@
 #include "record.hpp"
 
 #include <components/esm/defs.hpp>
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/misc/stringops.hpp>
 
 #include <algorithm>
diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp
index 842cc8003a..14478a6c85 100644
--- a/components/esmloader/load.cpp
+++ b/components/esmloader/load.cpp
@@ -4,16 +4,16 @@
 #include "record.hpp"
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm/cellref.hpp>
+#include <components/esm3/cellref.hpp>
 #include <components/esm/defs.hpp>
-#include <components/esm/esmreader.hpp>
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
+#include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/misc/resourcehelpers.hpp>
diff --git a/components/esmloader/load.hpp b/components/esmloader/load.hpp
index 39d6f48b81..eae592260a 100644
--- a/components/esmloader/load.hpp
+++ b/components/esmloader/load.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_ESMLOADER_LOAD_H
 #define OPENMW_COMPONENTS_ESMLOADER_LOAD_H
 
-#include <components/esm/esmreader.hpp>
+#include <components/esm3/esmreader.hpp>
 
 #include <string>
 #include <vector>
diff --git a/components/esmloader/record.hpp b/components/esmloader/record.hpp
index c076ee72c6..b88991cca1 100644
--- a/components/esmloader/record.hpp
+++ b/components/esmloader/record.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_ESMLOADER_RECORD_H
 #define OPENMW_COMPONENTS_ESMLOADER_RECORD_H
 
-#include <components/esm/loadcell.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <algorithm>
 #include <utility>
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 107255a7af..a2ac625c6c 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -6,8 +6,8 @@
 
 #include <components/terrain/storage.hpp>
 
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadltex.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadltex.hpp>
 
 namespace VFS
 {
diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp
index 32eddf399c..5baa4f24cf 100644
--- a/components/lua/configuration.hpp
+++ b/components/lua/configuration.hpp
@@ -4,7 +4,7 @@
 #include <map>
 #include <optional>
 
-#include <components/esm/luascripts.hpp>
+#include "components/esm/luascripts.hpp"
 
 namespace LuaUtil
 {
diff --git a/components/misc/convert.hpp b/components/misc/convert.hpp
index 45f3504dc1..81879cbf89 100644
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@@ -2,7 +2,7 @@
 #define OPENMW_COMPONENTS_MISC_CONVERT_H
 
 #include <components/esm/defs.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 #include <LinearMath/btTransform.h>
 #include <LinearMath/btVector3.h>
diff --git a/components/misc/coordinateconverter.hpp b/components/misc/coordinateconverter.hpp
index 1906414150..42e772c16d 100644
--- a/components/misc/coordinateconverter.hpp
+++ b/components/misc/coordinateconverter.hpp
@@ -2,9 +2,9 @@
 #define OPENMW_COMPONENTS_MISC_COORDINATECONVERTER_H
 
 #include <components/esm/defs.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace Misc
 {
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 2a5a945558..07b41ac814 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -4,7 +4,7 @@
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
 
-#include <components/esm/loadligh.hpp>
+#include <components/esm3/loadligh.hpp>
 #include <components/fallback/fallback.hpp>
 
 #include "lightmanager.hpp"
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 9ebdef61b0..6bfc724d7b 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -3,7 +3,7 @@
 #include <osg/Geometry>
 #include <osg/Material>
 
-#include <components/esm/loadpgrd.hpp>
+#include <components/esm3/loadpgrd.hpp>
 
 namespace SceneUtil
 {
diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 927530660e..05d212ef4f 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -5,7 +5,7 @@
 #include <osg/Geometry>
 
 #include "world.hpp"
-#include "../esm/loadland.hpp"
+#include "../esm3/loadland.hpp"
 
 #include <components/resource/scenemanager.hpp>
 #include <components/terrain/storage.hpp>
author	Bret Curtis <bret.curtis@gmail.com>	2022-01-22 15:58:41 +0100
committer	Bret Curtis <psi29a@gmail.com>	2022-01-23 17:04:48 +0100
commit	d1fb8545217a4e4044e6825eace60a485618954c (patch)
tree	c436c6712b3238af4991b139e7f00a5c9f795c15
parent	c263bbf0f68aa66891efadb7d09bc2f31706f088 (diff)