diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42574ce..0b75525 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,12 +8,12 @@ set(
 	UCHARDET_SOURCES
 	CharDistribution.cpp
 	JpCntx.cpp
-	LangBulgarianModel.cpp
-	LangCyrillicModel.cpp
-	LangGreekModel.cpp
-	LangHungarianModel.cpp
-	LangHebrewModel.cpp
-	LangThaiModel.cpp
+	LangModels/LangBulgarianModel.cpp
+	LangModels/LangCyrillicModel.cpp
+	LangModels/LangGreekModel.cpp
+	LangModels/LangHungarianModel.cpp
+	LangModels/LangHebrewModel.cpp
+	LangModels/LangThaiModel.cpp
 	nsHebrewProber.cpp
 	nsCharSetProber.cpp
 	nsBig5Prober.cpp
diff --git a/src/LangBulgarianModel.cpp b/src/LangModels/LangBulgarianModel.cpp
similarity index 99%
rename from src/LangBulgarianModel.cpp
rename to src/LangModels/LangBulgarianModel.cpp
index 9828ab5..283f35e 100644
--- a/src/LangBulgarianModel.cpp
+++ b/src/LangModels/LangBulgarianModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSBCharSetProber.h"
+#include "../nsSBCharSetProber.h"
 /****************************************************************
 CTR: Control characters that usually does not exist in any text
 RET: Carriage/Return
diff --git a/src/LangCyrillicModel.cpp b/src/LangModels/LangCyrillicModel.cpp
similarity index 99%
rename from src/LangCyrillicModel.cpp
rename to src/LangModels/LangCyrillicModel.cpp
index 90d0758..678a6d1 100644
--- a/src/LangCyrillicModel.cpp
+++ b/src/LangModels/LangCyrillicModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSBCharSetProber.h"
+#include "../nsSBCharSetProber.h"
 
 
 
diff --git a/src/LangGreekModel.cpp b/src/LangModels/LangGreekModel.cpp
similarity index 99%
rename from src/LangGreekModel.cpp
rename to src/LangModels/LangGreekModel.cpp
index 5120b2e..b71f10b 100644
--- a/src/LangGreekModel.cpp
+++ b/src/LangModels/LangGreekModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSBCharSetProber.h"
+#include "../nsSBCharSetProber.h"
 /****************************************************************
 CTR: Control characters that usually does not exist in any text
 RET: Carriage/Return
diff --git a/src/LangHebrewModel.cpp b/src/LangModels/LangHebrewModel.cpp
similarity index 99%
rename from src/LangHebrewModel.cpp
rename to src/LangModels/LangHebrewModel.cpp
index dcc1e7a..c808d0e 100644
--- a/src/LangHebrewModel.cpp
+++ b/src/LangModels/LangHebrewModel.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSBCharSetProber.h"
+#include "../nsSBCharSetProber.h"
 
 
 /****************************************************************
diff --git a/src/LangHungarianModel.cpp b/src/LangModels/LangHungarianModel.cpp
similarity index 99%
rename from src/LangHungarianModel.cpp
rename to src/LangModels/LangHungarianModel.cpp
index 72c25d5..5c9b10f 100644
--- a/src/LangHungarianModel.cpp
+++ b/src/LangModels/LangHungarianModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSBCharSetProber.h"
+#include "../nsSBCharSetProber.h"
 /****************************************************************
 CTR: Control characters that usually does not exist in any text
 RET: Carriage/Return
diff --git a/src/LangThaiModel.cpp b/src/LangModels/LangThaiModel.cpp
similarity index 99%
rename from src/LangThaiModel.cpp
rename to src/LangModels/LangThaiModel.cpp
index e8db744..a8bfbdb 100644
--- a/src/LangThaiModel.cpp
+++ b/src/LangModels/LangThaiModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSBCharSetProber.h"
+#include "../nsSBCharSetProber.h"
 
 
 /****************************************************************