diff --git a/include/Engine/Core/EntityXMLFileParser.h b/include/Engine/Core/EntityXMLFileParser.h
index 984f9e46..4bc2fab9 100644
--- a/include/Engine/Core/EntityXMLFileParser.h
+++ b/include/Engine/Core/EntityXMLFileParser.h
@@ -6,12 +6,13 @@
 
 class EntityXMLFileParser
 {
+    friend class EntityFile;
 public:
     EntityXMLFileParser(const EntityXMLFile* entityFile);
 
+private:
     EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
 
-private:
     const EntityXMLFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;
diff --git a/include/Engine/Core/EntityXMLFilePreprocessor.h b/include/Engine/Core/EntityXMLFilePreprocessor.h
index e102ef79..4f969291 100644
--- a/include/Engine/Core/EntityXMLFilePreprocessor.h
+++ b/include/Engine/Core/EntityXMLFilePreprocessor.h
@@ -21,12 +21,13 @@
 
 class EntityXMLFilePreprocessor
 {
+    friend class EntityFile;
 public:
     EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
 
+private:
     void RegisterComponents(World* world);
 
-private:
     const EntityXMLFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;
diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h
index b565367a..655ac9b9 100644
--- a/include/Engine/Editor/EditorSystem.h
+++ b/include/Engine/Editor/EditorSystem.h
@@ -5,8 +5,7 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityXMLFilePreprocessor.h"
-#include "../Core/EntityXMLFileParser.h"
+#include "../Core/EntityFile.h"
 #include "../Core/EntityXMLFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"
diff --git a/include/Game/Systems/AmmoPickupSystem.h b/include/Game/Systems/AmmoPickupSystem.h
index 8e5c4f1d..70c5630f 100644
--- a/include/Game/Systems/AmmoPickupSystem.h
+++ b/include/Game/Systems/AmmoPickupSystem.h
@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"
diff --git a/include/Game/Systems/BoostSystem.h b/include/Game/Systems/BoostSystem.h
index 525918a4..f02e9472 100644
--- a/include/Game/Systems/BoostSystem.h
+++ b/include/Game/Systems/BoostSystem.h
@@ -3,7 +3,7 @@
 
 #include "Core/System.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 
diff --git a/include/Game/Systems/DamageIndicatorSystem.h b/include/Game/Systems/DamageIndicatorSystem.h
index 935089fa..9c88ba78 100644
--- a/include/Game/Systems/DamageIndicatorSystem.h
+++ b/include/Game/Systems/DamageIndicatorSystem.h
@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 #include <tuple>
diff --git a/include/Game/Systems/PickupSpawnSystem.h b/include/Game/Systems/PickupSpawnSystem.h
index 1151b487..b72b8b25 100644
--- a/include/Game/Systems/PickupSpawnSystem.h
+++ b/include/Game/Systems/PickupSpawnSystem.h
@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
diff --git a/include/Game/Systems/PlayerDeathSystem.h b/include/Game/Systems/PlayerDeathSystem.h
index 96ed2ab5..e4f96114 100644
--- a/include/Game/Systems/PlayerDeathSystem.h
+++ b/include/Game/Systems/PlayerDeathSystem.h
@@ -6,10 +6,7 @@
 #include "GLM.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
-
-#include "Core/EntityXMLFile.h"
-#include "Core/EntityXMLFileParser.h"
-
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDeath.h"
 #include "Core/EEntityDeleted.h"
 
diff --git a/include/Game/Systems/PlayerMovementSystem.h b/include/Game/Systems/PlayerMovementSystem.h
index 8b6e4e54..bf7b4718 100644
--- a/include/Game/Systems/PlayerMovementSystem.h
+++ b/include/Game/Systems/PlayerMovementSystem.h
@@ -6,9 +6,7 @@
 #include <imgui/imgui.h>
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
-
-#include "Core/EntityXMLFile.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 
 class PlayerMovementSystem : public ImpureSystem
 {
diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index 3e664161..62ddba88 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -2,6 +2,7 @@
 #include "Core/UniformScaleSystem.h"
 #include "Editor/EditorRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
+#include "Core/EntityFile.h"
 
 EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
     : System(params)
@@ -259,12 +260,10 @@ EntityWrapper EditorSystem::importEntity(EntityWrapper parent, boost::filesystem
     }
 
     try {
-        auto entityFile = ResourceManager::Load<EntityXMLFile>(filePath.string());
-        EntityXMLFilePreprocessor fpp(entityFile);
-        fpp.RegisterComponents(parent.World);
-        EntityXMLFileParser fp(entityFile);
-        EntityID newEntity = fp.MergeEntities(parent.World, parent.ID);
-        return EntityWrapper(parent.World, newEntity);
+        auto entityFile = ResourceManager::Load<EntityFile>(filePath.string());
+        EntityWrapper newEntity = entityFile->MergeInto(parent.World);
+        parent.World->SetParent(newEntity.ID, parent.ID);
+        return newEntity;
     } catch (const std::exception& e) {
         LOG_ERROR("Failed to import entity \"%s\": \"%s\"", filePath.string().c_str(), e.what());
         return EntityWrapper::Invalid;
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 1a672f25..5e82dc2e 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -82,11 +82,8 @@ Game::Game(int argc, char* argv[])
     m_World = new World(m_EventBroker);
     std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
     if (!mapToLoad.empty()) {
-        auto file = ResourceManager::Load<EntityXMLFile>(mapToLoad);
-        EntityXMLFilePreprocessor fpp(file);
-        fpp.RegisterComponents(m_World);
-        EntityXMLFileParser fp(file);
-        fp.MergeEntities(m_World);
+        auto file = ResourceManager::Load<EntityFile>(mapToLoad);
+        file->MergeInto(m_World);
     }
 
     // Create the sound manager
diff --git a/src/Game/Systems/AmmoPickupSystem.cpp b/src/Game/Systems/AmmoPickupSystem.cpp
index e3051efe..062efe94 100644
--- a/src/Game/Systems/AmmoPickupSystem.cpp
+++ b/src/Game/Systems/AmmoPickupSystem.cpp
@@ -20,17 +20,16 @@ void AmmoPickupSystem::Update(double dt)
             auto& somePickup = *it;
             somePickup.DecreaseThisRespawnTimer -= dt;
             if (somePickup.DecreaseThisRespawnTimer < 0.0) {
-                auto entityFile = ResourceManager::Load<EntityXMLFile>("Schema/Entities/AmmoPickup.xml");
-                EntityXMLFileParser parser(entityFile);
-                EntityID ammoPickupID = parser.MergeEntities(m_World);
+                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/AmmoPickup.xml");
+                EntityWrapper ammoPickup = entityFile->MergeInto(m_World);
 
                 //let the world know a pickup has spawned
                 Events::PickupSpawned ePickupSpawned;
-                ePickupSpawned.Pickup = EntityWrapper(m_World, ammoPickupID);
+                ePickupSpawned.Pickup = ammoPickup;
                 m_EventBroker->Publish(ePickupSpawned);
 
                 //copy values from the old entity to the new entity
-                auto& newAmmoPickupEntity = EntityWrapper(m_World, ammoPickupID);
+                auto& newAmmoPickupEntity = ammoPickup;
                 newAmmoPickupEntity["Transform"]["Position"] = somePickup.Pos;
                 newAmmoPickupEntity["AmmoPickup"]["AmmoGain"] = somePickup.AmmoGain;
                 newAmmoPickupEntity["AmmoPickup"]["RespawnTimer"] = somePickup.RespawnTimer;
diff --git a/src/Game/Systems/BoostSystem.cpp b/src/Game/Systems/BoostSystem.cpp
index 7f335d1f..c79576e4 100644
--- a/src/Game/Systems/BoostSystem.cpp
+++ b/src/Game/Systems/BoostSystem.cpp
@@ -38,11 +38,10 @@ bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
         m_World->DeleteEntity(playerBoostAssaultEntity.ID);
     }
     //load boost XML file, set it entity parented with the victim player
-    auto entityFile = ResourceManager::Load<EntityXMLFile>(classXML);
-    EntityXMLFileParser parser(entityFile);
-    EntityID boostAssaultEntity = parser.MergeEntities(m_World);
-    m_World->SetName(boostAssaultEntity, className);
-    m_World->SetParent(boostAssaultEntity, e.Victim.ID);
+    auto entityFile = ResourceManager::Load<EntityFile>(classXML);
+    EntityWrapper boostAssaultEntity = entityFile->MergeInto(m_World);
+    m_World->SetName(boostAssaultEntity.ID, className);
+    m_World->SetParent(boostAssaultEntity.ID, e.Victim.ID);
 
     return true;
 }
diff --git a/src/Game/Systems/DamageIndicatorSystem.cpp b/src/Game/Systems/DamageIndicatorSystem.cpp
index 55a1046c..e68f741d 100644
--- a/src/Game/Systems/DamageIndicatorSystem.cpp
+++ b/src/Game/Systems/DamageIndicatorSystem.cpp
@@ -49,16 +49,14 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
     float angleBetweenVectors = CalculateAngle(e.Victim, inflictorPos);
 
     //load & set the "2d" sprite
-    auto entityFile = ResourceManager::Load<EntityXMLFile>("Schema/Entities/DamageIndicator.xml");
-    EntityXMLFileParser parser(entityFile);
-    EntityID spriteID = parser.MergeEntities(m_World);
-    m_World->SetParent(spriteID, m_CurrentCamera);
-    auto spriteWrapper = EntityWrapper(m_World, spriteID);
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DamageIndicator.xml");
+    EntityWrapper sprite = entityFile->MergeInto(m_World);
+    m_World->SetParent(sprite.ID, m_CurrentCamera);
     //simply set the rotation z-wise to the angleBetweenVectors
-    spriteWrapper["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
+    sprite["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
 
     if (!IsServer) {
-        updateDamageIndicatorVector.emplace_back(spriteWrapper, inflictorPos);
+        updateDamageIndicatorVector.emplace_back(sprite, inflictorPos);
     }
 
     return true;
diff --git a/src/Game/Systems/PickupSpawnSystem.cpp b/src/Game/Systems/PickupSpawnSystem.cpp
index 9d1ce5b6..99da931f 100644
--- a/src/Game/Systems/PickupSpawnSystem.cpp
+++ b/src/Game/Systems/PickupSpawnSystem.cpp
@@ -18,17 +18,16 @@ void PickupSpawnSystem::Update(double dt)
             somePickup.DecreaseThisRespawnTimer -= dt;
             if (somePickup.DecreaseThisRespawnTimer < 0.0) {
                 //spawn the new healthPickup
-                auto entityFile = ResourceManager::Load<EntityXMLFile>("Schema/Entities/HealthPickup.xml");
-                EntityXMLFileParser parser(entityFile);
-                EntityID healthPickupID = parser.MergeEntities(m_World);
+                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/HealthPickup.xml");
+                EntityWrapper healthPickup = entityFile->MergeInto(m_World);
 
                 //let the world know a pickup has spawned (graphics effects, etc)
                 Events::PickupSpawned ePickupSpawned;
-                ePickupSpawned.Pickup = EntityWrapper(m_World, healthPickupID);
+                ePickupSpawned.Pickup = healthPickup;
                 m_EventBroker->Publish(ePickupSpawned);
 
                 //copy values from the old entity to the new entity
-                auto& newHealthPickupEntity = EntityWrapper(m_World, healthPickupID);
+                auto& newHealthPickupEntity = healthPickup;
                 newHealthPickupEntity["Transform"]["Position"] = somePickup.Pos;
                 newHealthPickupEntity["HealthPickup"]["HealthGain"] = somePickup.HealthGain;
                 newHealthPickupEntity["HealthPickup"]["RespawnTimer"] = somePickup.RespawnTimer;
diff --git a/src/Game/Systems/PlayerDeathSystem.cpp b/src/Game/Systems/PlayerDeathSystem.cpp
index 1a491580..cbf0927f 100644
--- a/src/Game/Systems/PlayerDeathSystem.cpp
+++ b/src/Game/Systems/PlayerDeathSystem.cpp
@@ -28,10 +28,8 @@ bool PlayerDeathSystem::OnPlayerDeath(Events::PlayerDeath& e)
 void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
 {
     //load the explosioneffect XML
-    auto deathEffect = ResourceManager::Load<EntityXMLFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
-    EntityXMLFileParser parser(deathEffect);
-    EntityID deathEffectID = parser.MergeEntities(m_World);
-    EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
+    EntityWrapper deathEffectEW = entityFile->MergeInto(m_World);
 
     //components that we need from player
     auto playerModel = player.FirstChildByName("PlayerModel");
diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp
index 5a687b84..802b5048 100644
--- a/src/Game/Systems/PlayerMovementSystem.cpp
+++ b/src/Game/Systems/PlayerMovementSystem.cpp
@@ -328,10 +328,8 @@ bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e)
 void PlayerMovementSystem::spawnHexagon(EntityWrapper target)
 {
     //put a hexagon at the entitys... feet?
-    auto hexagonEffect = ResourceManager::Load<EntityXMLFile>("Schema/Entities/DoubleJumpHexagon.xml");
-    EntityXMLFileParser parser(hexagonEffect);
-    EntityID hexagonEffectID = parser.MergeEntities(m_World);
-    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+    EntityWrapper hexagonEW = entityFile->MergeInto(m_World);
     hexagonEW["Transform"]["Position"] = (glm::vec3)target["Transform"]["Position"];
 }
 
@@ -342,10 +340,8 @@ bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e)
         return false;
     }
 
-    auto dashEffectResource = ResourceManager::Load<EntityXMLFile>("Schema/Entities/DashEffect.xml");
-    EntityXMLFileParser parser(dashEffectResource);
-    EntityID dashEffectID = parser.MergeEntities(m_World);
-    EntityWrapper dashEffect(m_World, dashEffectID);
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DashEffect.xml");
+    EntityWrapper dashEffect = entityFile->MergeInto(m_World);
     auto playerModel = player.FirstChildByName("PlayerModel");
     auto playerEntityModel = playerModel["Model"];
     auto playerEntityAnimation = playerModel["Animation"];