diff --git a/include/ehs/io/FontAtlas.h b/include/ehs/io/FontAtlas.h
index 73b50c0..cb59142 100644
--- a/include/ehs/io/FontAtlas.h
+++ b/include/ehs/io/FontAtlas.h
@@ -6,7 +6,7 @@
 #include "Glyph.h"
 #include "ehs/Anchor.h"
 #include "ehs/io/img/Img.h"
-#include "ehs/io/model/Mesh.h"
+#include "ehs/io/mdl/Mesh.h"
 
 namespace ehs
 {
diff --git a/src/io/audio/Audio.cpp b/src/io/audio/Audio.cpp
index 79ff885..71f4b7c 100644
--- a/src/io/audio/Audio.cpp
+++ b/src/io/audio/Audio.cpp
@@ -58,8 +58,8 @@ namespace ehs
 	}
 
 	Audio::Audio(const Str_8& filePath)
-			: Resource(File::ParseName_8(filePath)), sampleRate(0), dataType(DataType::FLOAT), byteDepth(0), channels(0),
-			  frames(0), length(0.0f), data(nullptr), peak(nullptr)
+		: Resource(File::ParseName_8(filePath)), sampleRate(0), dataType(DataType::FLOAT), byteDepth(0), channels(0),
+		frames(0), length(0.0f), data(nullptr), peak(nullptr)
 	{
 		AddType("Audio");
 
@@ -81,6 +81,8 @@ namespace ehs
 	}
 
 	Audio::Audio(const Str_8& filePath, DataType type)
+		: Resource(File::ParseName_8(filePath)), sampleRate(0), dataType(DataType::FLOAT), byteDepth(0), channels(0),
+		frames(0), length(0.0f), data(nullptr), peak(nullptr)
 	{
 		AddType("Audio");
 
@@ -2048,7 +2050,7 @@ namespace ehs
 		UInt_64 size = dChunk.GetData().Size();
 		UInt_64 frames = size / byteDepth / channels;
 
-		*out = std::move(Audio(out->GetId(), sampleRate, dataType, channels, frames));
+		*out = Audio(out->GetId(), sampleRate, dataType, channels, frames);
 
 		Serializer<> dataSer = dChunk.GetData();
 
diff --git a/src/io/model/AnimBone.cpp b/src/io/model/AnimBone.cpp
index 0e973c7..97d6d63 100644
--- a/src/io/model/AnimBone.cpp
+++ b/src/io/model/AnimBone.cpp
@@ -1,4 +1,4 @@
-#include "ehs/io/model/AnimBone.h"
+#include "ehs/io/mdl/AnimBone.h"
 
 #include <algorithm>
 
diff --git a/src/io/model/Animation.cpp b/src/io/model/Animation.cpp
index 21c1de8..d947d8a 100644
--- a/src/io/model/Animation.cpp
+++ b/src/io/model/Animation.cpp
@@ -1,4 +1,4 @@
-#include "ehs/io/model/Animation.h"
+#include "ehs/io/mdl/Animation.h"
 
 namespace ehs
 {
diff --git a/src/io/model/Bone.cpp b/src/io/model/Bone.cpp
index 1cae5c2..7827202 100644
--- a/src/io/model/Bone.cpp
+++ b/src/io/model/Bone.cpp
@@ -1,4 +1,4 @@
-#include "ehs/io/model/Bone.h"
+#include "ehs/io/mdl/Bone.h"
 
 namespace ehs
 {
diff --git a/src/io/model/KeyFrame.cpp b/src/io/model/KeyFrame.cpp
index 525b940..4ed2e75 100644
--- a/src/io/model/KeyFrame.cpp
+++ b/src/io/model/KeyFrame.cpp
@@ -1,4 +1,4 @@
-#include "ehs/io/model/KeyFrame.h"
+#include "ehs/io/mdl/KeyFrame.h"
 
 #include <algorithm>
 
diff --git a/src/io/model/Mesh.cpp b/src/io/model/Mesh.cpp
index d22eb7d..629027c 100644
--- a/src/io/model/Mesh.cpp
+++ b/src/io/model/Mesh.cpp
@@ -1,4 +1,4 @@
-#include "ehs/io/model/Mesh.h"
+#include "ehs/io/mdl/Mesh.h"
 
 namespace ehs
 {
diff --git a/src/io/model/PropertyChange.cpp b/src/io/model/PropertyChange.cpp
index 5606e5f..300714a 100644
--- a/src/io/model/PropertyChange.cpp
+++ b/src/io/model/PropertyChange.cpp
@@ -1,4 +1,4 @@
-#include "ehs/io/model/PropertyChange.h"
+#include "ehs/io/mdl/PropertyChange.h"
 
 namespace ehs
 {