diff --git a/ext/libcharsetdetect.txt b/src/ext/libcharsetdetect.txt
similarity index 100%
rename from ext/libcharsetdetect.txt
rename to src/ext/libcharsetdetect.txt
diff --git a/ext/libcharsetdetect/.gitignore b/src/ext/libcharsetdetect/.gitignore
similarity index 100%
rename from ext/libcharsetdetect/.gitignore
rename to src/ext/libcharsetdetect/.gitignore
diff --git a/ext/libcharsetdetect/CMakeLists.txt b/src/ext/libcharsetdetect/CMakeLists.txt
similarity index 100%
rename from ext/libcharsetdetect/CMakeLists.txt
rename to src/ext/libcharsetdetect/CMakeLists.txt
diff --git a/ext/libcharsetdetect/Makefile.test b/src/ext/libcharsetdetect/Makefile.test
similarity index 100%
rename from ext/libcharsetdetect/Makefile.test
rename to src/ext/libcharsetdetect/Makefile.test
diff --git a/ext/libcharsetdetect/README.md b/src/ext/libcharsetdetect/README.md
similarity index 100%
rename from ext/libcharsetdetect/README.md
rename to src/ext/libcharsetdetect/README.md
diff --git a/ext/libcharsetdetect/charsetdetect.cpp b/src/ext/libcharsetdetect/charsetdetect.cpp
similarity index 100%
rename from ext/libcharsetdetect/charsetdetect.cpp
rename to src/ext/libcharsetdetect/charsetdetect.cpp
diff --git a/ext/libcharsetdetect/charsetdetect.h b/src/ext/libcharsetdetect/charsetdetect.h
similarity index 100%
rename from ext/libcharsetdetect/charsetdetect.h
rename to src/ext/libcharsetdetect/charsetdetect.h
diff --git a/ext/libcharsetdetect/charsetdetectPriv.h b/src/ext/libcharsetdetect/charsetdetectPriv.h
similarity index 100%
rename from ext/libcharsetdetect/charsetdetectPriv.h
rename to src/ext/libcharsetdetect/charsetdetectPriv.h
diff --git a/ext/libcharsetdetect/configure b/src/ext/libcharsetdetect/configure
similarity index 100%
rename from ext/libcharsetdetect/configure
rename to src/ext/libcharsetdetect/configure
diff --git a/ext/libcharsetdetect/configure-iphone b/src/ext/libcharsetdetect/configure-iphone
similarity index 100%
rename from ext/libcharsetdetect/configure-iphone
rename to src/ext/libcharsetdetect/configure-iphone
diff --git a/ext/libcharsetdetect/configure-iphone-simulator b/src/ext/libcharsetdetect/configure-iphone-simulator
similarity index 100%
rename from ext/libcharsetdetect/configure-iphone-simulator
rename to src/ext/libcharsetdetect/configure-iphone-simulator
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Big5Freq.tab b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Big5Freq.tab
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Big5Freq.tab
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Big5Freq.tab
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/CharDistribution.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCKRFreq.tab b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCKRFreq.tab
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCKRFreq.tab
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCKRFreq.tab
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCTWFreq.tab b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCTWFreq.tab
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCTWFreq.tab
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/EUCTWFreq.tab
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/GB2312Freq.tab b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/GB2312Freq.tab
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/GB2312Freq.tab
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/GB2312Freq.tab
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JISFreq.tab b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JISFreq.tab
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JISFreq.tab
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JISFreq.tab
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/JpCntx.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangBulgarianModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCyrillicModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangCzechModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFinnishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFinnishModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFinnishModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFinnishModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFrenchModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFrenchModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFrenchModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangFrenchModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGermanModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGermanModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGermanModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGermanModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGreekModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGreekModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGreekModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangGreekModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHebrewModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangHungarianModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangPolishModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSpanishModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSwedishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSwedishModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSwedishModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangSwedishModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangThaiModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangThaiModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangThaiModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangThaiModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangTurkishModel.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangTurkishModel.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangTurkishModel.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/LangTurkishModel.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Makefile.in b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Makefile.in
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Makefile.in
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/Makefile.in
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsBig5Prober.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCharSetProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsCodingStateMachine.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCJPProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCKRProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEUCTWProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscCharsetProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscSM.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscSM.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscSM.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsEscSM.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsGB2312Prober.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsHebrewProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsLatin1Prober.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSGroupProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsMBCSSM.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsPkgInt.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsPkgInt.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsPkgInt.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsPkgInt.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCSGroupProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSBCharSetProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsSJISProber.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUTF8Prober.h
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.cpp b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.cpp
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.cpp
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.cpp
diff --git a/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.h b/src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.h
similarity index 100%
rename from ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.h
rename to src/ext/libcharsetdetect/mozilla/extensions/universalchardet/src/base/nsUniversalDetector.h
diff --git a/ext/libcharsetdetect/nscore.h b/src/ext/libcharsetdetect/nscore.h
similarity index 100%
rename from ext/libcharsetdetect/nscore.h
rename to src/ext/libcharsetdetect/nscore.h
diff --git a/ext/libcharsetdetect/nspr-emu/README.md b/src/ext/libcharsetdetect/nspr-emu/README.md
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/README.md
rename to src/ext/libcharsetdetect/nspr-emu/README.md
diff --git a/src/ext/libcharsetdetect/nspr-emu/nsDebug.h b/src/ext/libcharsetdetect/nspr-emu/nsDebug.h
new file mode 100644
index 0000000..e69de29
diff --git a/ext/libcharsetdetect/nspr-emu/obsolete/protypes.h b/src/ext/libcharsetdetect/nspr-emu/obsolete/protypes.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/obsolete/protypes.h
rename to src/ext/libcharsetdetect/nspr-emu/obsolete/protypes.h
diff --git a/ext/libcharsetdetect/nspr-emu/prcpucfg.h b/src/ext/libcharsetdetect/nspr-emu/prcpucfg.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prcpucfg.h
rename to src/ext/libcharsetdetect/nspr-emu/prcpucfg.h
diff --git a/ext/libcharsetdetect/nspr-emu/prcpucfg_freebsd.h b/src/ext/libcharsetdetect/nspr-emu/prcpucfg_freebsd.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prcpucfg_freebsd.h
rename to src/ext/libcharsetdetect/nspr-emu/prcpucfg_freebsd.h
diff --git a/ext/libcharsetdetect/nspr-emu/prcpucfg_linux.h b/src/ext/libcharsetdetect/nspr-emu/prcpucfg_linux.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prcpucfg_linux.h
rename to src/ext/libcharsetdetect/nspr-emu/prcpucfg_linux.h
diff --git a/ext/libcharsetdetect/nspr-emu/prcpucfg_mac.h b/src/ext/libcharsetdetect/nspr-emu/prcpucfg_mac.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prcpucfg_mac.h
rename to src/ext/libcharsetdetect/nspr-emu/prcpucfg_mac.h
diff --git a/ext/libcharsetdetect/nspr-emu/prcpucfg_openbsd.h b/src/ext/libcharsetdetect/nspr-emu/prcpucfg_openbsd.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prcpucfg_openbsd.h
rename to src/ext/libcharsetdetect/nspr-emu/prcpucfg_openbsd.h
diff --git a/ext/libcharsetdetect/nspr-emu/prcpucfg_win.h b/src/ext/libcharsetdetect/nspr-emu/prcpucfg_win.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prcpucfg_win.h
rename to src/ext/libcharsetdetect/nspr-emu/prcpucfg_win.h
diff --git a/ext/libcharsetdetect/nspr-emu/prmem.h b/src/ext/libcharsetdetect/nspr-emu/prmem.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prmem.h
rename to src/ext/libcharsetdetect/nspr-emu/prmem.h
diff --git a/ext/libcharsetdetect/nspr-emu/prtypes.h b/src/ext/libcharsetdetect/nspr-emu/prtypes.h
similarity index 100%
rename from ext/libcharsetdetect/nspr-emu/prtypes.h
rename to src/ext/libcharsetdetect/nspr-emu/prtypes.h
diff --git a/ext/libcharsetdetect/trchardet.c b/src/ext/libcharsetdetect/trchardet.c
similarity index 100%
rename from ext/libcharsetdetect/trchardet.c
rename to src/ext/libcharsetdetect/trchardet.c
diff --git a/ext/libcharsetdetect/update-mozilla b/src/ext/libcharsetdetect/update-mozilla
similarity index 100%
rename from ext/libcharsetdetect/update-mozilla
rename to src/ext/libcharsetdetect/update-mozilla