diff --git a/NazaraModuleTemplate/build/scripts/module/modulename.lua b/NazaraModuleTemplate/build/scripts/module/modulename.lua
deleted file mode 100644
index cd24f2d12..000000000
--- a/NazaraModuleTemplate/build/scripts/module/modulename.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-if (not _OPTIONS["united"]) then
-	project "NazaraModuleName"
-end
-
-files
-{
-	"../include/Nazara/ModuleName/**.hpp",
-	"../include/Nazara/ModuleName/**.inl",
-	"../src/Nazara/ModuleName/**.hpp",
-	"../src/Nazara/ModuleName/**.cpp"
-}
-
-if (os.is("windows")) then
-	excludes { "../src/Nazara/ModuleName/Posix/*.hpp", "../src/Nazara/ModuleName/Posix/*.cpp" }
-else
-	excludes { "../src/Nazara/ModuleName/Win32/*.hpp", "../src/Nazara/ModuleName/Win32/*.cpp" }
-end
-
-if (_OPTIONS["united"]) then
-	excludes "../src/Nazara/ModuleName/Debug/NewOverload.cpp"
-else
-	configuration "DebugStatic"
-		links "NazaraCore-s-d"
-
-	configuration "ReleaseStatic"
-		links "NazaraCore-s"
-
-	configuration "DebugDLL"
-		links "NazaraCore-d"
-
-	configuration "ReleaseDLL"
-		links "NazaraCore"
-end
\ No newline at end of file
diff --git a/NazaraModuleTemplate/build/scripts/modules/modulename.lua b/NazaraModuleTemplate/build/scripts/modules/modulename.lua
new file mode 100644
index 000000000..7f954dd6a
--- /dev/null
+++ b/NazaraModuleTemplate/build/scripts/modules/modulename.lua
@@ -0,0 +1,15 @@
+MODULE.Name = "ModuleName"
+
+MODULE.Libraries = {
+	"NazaraCore"
+}
+
+MODULE.OsFiles.Windows = {
+	"../src/Nazara/ModuleName/Win32/**.hpp",
+	"../src/Nazara/ModuleName/Win32/**.cpp"
+}
+
+MODULE.OsFiles.Posix = {
+	"../src/Nazara/ModuleName/Posix/**.hpp",
+	"../src/Nazara/ModuleName/Posix/**.cpp"
+}
diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
index b3fcc13e2..46bdc8cd9 100644
--- a/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
+++ b/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
@@ -9,17 +9,20 @@
 
 #include <Nazara/Prerequesites.hpp>
 
-class NAZARA_API NzClassName
+namespace Nz
 {
-	public:
-		NzClassName();
+	class NAZARA_MODULENAME_API API ClassName
+	{
+		public:
+			ClassName();
 
-		int GetAttribute() const;
+			int GetAttribute() const;
 
-		void SetAttribute(int attribute);
+			void SetAttribute(int attribute);
 
-	private:
-		int m_attribute;
-};
+		private:
+			int m_attribute;
+	};
+}
 
 #endif // NAZARA_CLASSNAME_HPP
diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
index 96d9322c9..58284f519 100644
--- a/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
+++ b/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
@@ -10,20 +10,23 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Initializer.hpp>
 
-class NAZARA_API NzModuleName
+namespace Nz
 {
-	public:
-		NzModuleName() = delete;
-		~NzModuleName() = delete;
+	class NAZARA_MODULENAME_API ModuleName
+	{
+		public:
+			ModuleName() = delete;
+			~ModuleName() = delete;
 
-		static bool Initialize();
+			static bool Initialize();
 
-		static bool IsInitialized();
+			static bool IsInitialized();
 
-		static void Uninitialize();
+			static void Uninitialize();
 
-	private:
-		static unsigned int s_moduleReferenceCounter;
-};
+		private:
+			static unsigned int s_moduleReferenceCounter;
+	};	
+}
 
 #endif // NAZARA_MODULENAME_HPP
diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp
index cd6ac9ac7..636cb270c 100644
--- a/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp
+++ b/NazaraModuleTemplate/src/Nazara/ModuleName/ClassName.cpp
@@ -5,17 +5,21 @@
 #include <Nazara/ModuleName/ClassName.hpp>
 #include <Nazara/ModuleName/Debug.hpp>
 
-NzClassName::NzClassName() :
-m_attribute(42)
+namespace Nz
 {
+	ClassName::ClassName() :
+	m_attribute(42)
+	{
+	}
+
+	int ClassName::GetAttribute() const
+	{
+		return m_attribute;
+	}
+
+	void ClassName::SetAttribute(int attribute)
+	{
+		m_attribute = attribute;
+	}
 }
 
-int NzClassName::GetAttribute() const
-{
-	return m_attribute;
-}
-
-void NzClassName::SetAttribute(int attribute)
-{
-	m_attribute = attribute;
-}
diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/NewOverload.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/NewOverload.cpp
index 468fb119e..a9a767c1d 100644
--- a/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/NewOverload.cpp
+++ b/NazaraModuleTemplate/src/Nazara/ModuleName/Debug/NewOverload.cpp
@@ -10,22 +10,22 @@
 
 void* operator new(std::size_t size)
 {
-	return NzMemoryManager::Allocate(size, false);
+	return Nz::MemoryManager::Allocate(size, false);
 }
 
 void* operator new[](std::size_t size)
 {
-	return NzMemoryManager::Allocate(size, true);
+	return Nz::MemoryManager::Allocate(size, true);
 }
 
 void operator delete(void* pointer) noexcept
 {
-	NzMemoryManager::Free(pointer, false);
+	Nz::MemoryManager::Free(pointer, false);
 }
 
 void operator delete[](void* pointer) noexcept
 {
-	NzMemoryManager::Free(pointer, true);
+	Nz::MemoryManager::Free(pointer, true);
 }
 
 #endif // NAZARA_MODULENAME_MANAGE_MEMORY
diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
index 09b3d093b..1ae75d7ad 100644
--- a/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
+++ b/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
@@ -10,55 +10,61 @@
 #include <Nazara/ModuleName/Config.hpp>
 #include <Nazara/ModuleName/Debug.hpp>
 
-bool NzModuleName::Initialize()
+namespace Nz
 {
-	if (s_moduleReferenceCounter > 0)
+	bool ModuleName::Initialize()
 	{
+		if (s_moduleReferenceCounter > 0)
+		{
+			s_moduleReferenceCounter++;
+			return true; // Already initialized
+		}
+
+		// Initialize module dependencies
+		if (!NzCore::Initialize())
+		{
+			NazaraError("Failed to initialize core module");
+			return false;
+		}
+
 		s_moduleReferenceCounter++;
-		return true; // Déjà initialisé
+
+		CallOnExit onExit(ModuleName::Uninitialize);
+
+		// Initialize module here
+
+		onExit.Reset();
+
+		NazaraNotice("Initialized: ModuleName module");
+		return true;
 	}
 
-	// Initialisation des dépendances
-	if (!NzCore::Initialize())
+	bool ModuleName::IsInitialized()
 	{
-		NazaraError("Failed to initialize core module");
-		return false;
+		return s_moduleReferenceCounter != 0;
 	}
 
-	s_moduleReferenceCounter++;
-
-	// Initialisation du module
-	NzCallOnExit onExit(NzModuleName::Uninitialize);
-
-	onExit.Reset();
-
-	NazaraNotice("Initialized: ModuleName module");
-	return true;
-}
-
-bool NzModuleName::IsInitialized()
-{
-	return s_moduleReferenceCounter != 0;
-}
-
-void NzModuleName::Uninitialize()
-{
-	if (s_moduleReferenceCounter != 1)
+	void ModuleName::Uninitialize()
 	{
-		// Le module est soit encore utilisé, soit pas initialisé
-		if (s_moduleReferenceCounter > 1)
-			s_moduleReferenceCounter--;
+		if (s_moduleReferenceCounter != 1)
+		{
+			// Le module est soit encore utilisé, soit pas initialisé
+			if (s_moduleReferenceCounter > 1)
+				s_moduleReferenceCounter--;
 
-		return;
+			return;
+		}
+
+		s_moduleReferenceCounter = 0;
+
+		// Uninitialize module here
+
+		NazaraNotice("Uninitialized: ModuleName module");
+
+		// Free module dependencies
+		Core::Uninitialize();
 	}
 
-	// Libération du module
-	s_moduleReferenceCounter = 0;
-
-	NazaraNotice("Uninitialized: ModuleName module");
-
-	// Libération des dépendances
-	NzCore::Uninitialize();
+	unsigned int ModuleName::s_moduleReferenceCounter = 0;	
 }
 
-unsigned int NzModuleName::s_moduleReferenceCounter = 0;