more tidy up

searchpioneer · May 2, 2024 · 6a8593d · 6a8593d
1 parent 981f7a6
commit 6a8593d
Show file tree

Hide file tree

Showing 97 changed files with 186 additions and 204 deletions.
diff --git a/build/Lingua.IO/LanguageModelWriter.cs b/build/Lingua.IO/LanguageModelWriter.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Lingua.Api;
 using Lingua.Internal;
 using static Lingua.IO.PathValidation;
 

diff --git a/build/Lingua.IO/TrainingDataLanguageModel.cs b/build/Lingua.IO/TrainingDataLanguageModel.cs
@@ -3,7 +3,6 @@
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using Fractions;
-using Lingua.Api;
 using Lingua.Internal;
 
 namespace Lingua.IO;

diff --git a/build/Lingua.UnicodeScriptGenerator/Program.cs b/build/Lingua.UnicodeScriptGenerator/Program.cs
@@ -33,6 +33,8 @@ namespace Lingua;
 ///<summary>Unicode script information, version {version}</summary>
 public enum UnicodeScript
 {{
+    ///<summary>Unicode script for ""Unknown""</summary>
+    Unknown = 0,
 ");
 
 		var unicodeScripts = ReadUnicodeScriptsFromFile(fileName);
@@ -48,9 +50,7 @@ public enum UnicodeScript
 
 		var orderedScripts = CreateCollapsedOrderedRange(unicodeScripts);
 
-		builder.AppendLine(@"    ///<summary>Unicode script for ""Unknown""</summary>
-    Unknown,
-}
+		builder.AppendLine(@"}
 
 /// <summary>
 /// Extension method for <see cref=""char""/> to determine its <see cref=""UnicodeScript""/> property.

diff --git a/src/Lingua/Internal/Alphabet.cs b/src/Lingua/Internal/Alphabet.cs
@@ -1,5 +1,3 @@
-using Lingua.Api;
-
 namespace Lingua.Internal;
 
 internal enum Alphabet

diff --git a/src/Lingua/Api/CharExtensions.cs → src/Lingua/Internal/CharExtensions.cs b/src/Lingua/Api/CharExtensions.cs → src/Lingua/Internal/CharExtensions.cs
@@ -1,6 +1,4 @@
-using Lingua.Internal;
-
-namespace Lingua.Api;
+namespace Lingua.Internal;
 
 internal static class CharExtensions
 {

diff --git a/src/Lingua/Api/DictionaryExtensions.cs → src/Lingua/Internal/DictionaryExtensions.cs b/src/Lingua/Api/DictionaryExtensions.cs → src/Lingua/Internal/DictionaryExtensions.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-namespace Lingua.Api;
+namespace Lingua.Internal;
 
 internal static class DictionaryExtensions
 {

diff --git a/src/Lingua/Api/EnumerableExtensions.cs → src/Lingua/Internal/EnumerableExtensions.cs b/src/Lingua/Api/EnumerableExtensions.cs → src/Lingua/Internal/EnumerableExtensions.cs
@@ -1,6 +1,4 @@
-using Lingua.Internal;
-
-namespace Lingua.Api;
+namespace Lingua.Internal;
 
 internal static class EnumerableExtensions
 {
@@ -9,9 +7,7 @@ public static IndexedDictionary<TKey, TValue> ToIndexedDictionary<TKey, TValue>(
 	{
 		var dictionary = new IndexedDictionary<TKey, TValue>();
 		foreach (var keyValuePair in enumerable)
-		{
 			dictionary.Add(keyValuePair);
-		}
 
 		return dictionary;
 	}

diff --git a/src/Lingua/Api/IsoCode6391.cs → src/Lingua/IsoCode6391.cs b/src/Lingua/Api/IsoCode6391.cs → src/Lingua/IsoCode6391.cs
@@ -1,11 +1,14 @@
-namespace Lingua.Api;
+namespace Lingua;
 
 /// <summary>
 /// Two-character codes which serves as identifiers for major (macro) languages from the world,
 /// as well as some ancient languages.
 /// </summary>
 public enum IsoCode6391
 {
+	/// <summary>The ISO 639-1 code for the imaginary <see cref="Language.Unknown"/>.</summary>
+	None = 0,
+
 	/// <summary>The ISO 639-1 code for <see cref="Language.Afrikaans"/>.</summary>
 	Af,
 
@@ -242,7 +245,4 @@ public enum IsoCode6391
 
 	/// <summary>The ISO 639-1 code for <see cref="Language.Zulu"/>.</summary>
 	Zu,
-
-	/// <summary>The ISO 639-1 code for the imaginary <see cref="Language.Unknown"/>.</summary>
-	None
 }
diff --git a/src/Lingua/Api/IsoCode6393.cs → src/Lingua/IsoCode6393.cs b/src/Lingua/Api/IsoCode6393.cs → src/Lingua/IsoCode6393.cs
@@ -1,11 +1,14 @@
-namespace Lingua.Api;
+namespace Lingua;
 
 /// <summary>
 /// Three-character codes which serves as identifiers for individual languages from the world.
 /// It extends the ISO 639-2 alpha-3 codes with an aim to cover all known natural languages.
 /// </summary>
 public enum IsoCode6393
 {
+	/// <summary>The ISO 639-3 code for imaginary <see cref="Language.Unknown"/>.</summary>
+	None = 0,
+
 	/// <summary>The ISO 639-3 code for <see cref="Language.Afrikaans"/>.</summary>
 	Afr,
 
@@ -242,7 +245,4 @@ public enum IsoCode6393
 
 	/// <summary>The ISO 639-3 code for <see cref="Language.Zulu"/>.</summary>
 	Zul,
-
-	/// <summary>The ISO 639-3 code for imaginary <see cref="Language.Unknown"/>.</summary>
-	None,
 }
diff --git a/src/Lingua/Api/Language.cs → src/Lingua/Language.cs b/src/Lingua/Api/Language.cs → src/Lingua/Language.cs
@@ -1,7 +1,7 @@
 using Lingua.Internal;
-using static Lingua.Api.Language;
+using static Lingua.Language;
 
-namespace Lingua.Api;
+namespace Lingua;
 
 /// <summary>
 /// The supported detectable languages.
@@ -178,87 +178,87 @@ public static class LanguageInfo
 	private static readonly Dictionary<Language, LanguageProperties> LanguageProperties =
 		new(Enum.GetValues(typeof(Language)).Length)
 		{
-			[Afrikaans] = new(Api.IsoCode6391.Af, Api.IsoCode6393.Afr, [Alphabet.Latin]),
-			[Albanian] = new(Api.IsoCode6391.Sq, Api.IsoCode6393.Sqi, [Alphabet.Latin]),
-			[Amharic] = new(Api.IsoCode6391.Am, Api.IsoCode6393.Amh, [Alphabet.Ethiopic]),
-			[Arabic] = new(Api.IsoCode6391.Ar, Api.IsoCode6393.Ara, [Alphabet.Arabic]),
-			[Armenian] = new(Api.IsoCode6391.Hy, Api.IsoCode6393.Hye, [Alphabet.Armenian]),
-			[Azerbaijani] = new(Api.IsoCode6391.Az, Api.IsoCode6393.Aze, [Alphabet.Latin], "Əə"),
-			[Basque] = new(Api.IsoCode6391.Eu, Api.IsoCode6393.Eus, [Alphabet.Latin]),
-			[Belarusian] = new(Api.IsoCode6391.Be, Api.IsoCode6393.Bel, [Alphabet.Cyrillic]),
-			[Bengali] = new(Api.IsoCode6391.Bn, Api.IsoCode6393.Ben, [Alphabet.Bengali]),
-			[Bokmal] = new(Api.IsoCode6391.Nb, Api.IsoCode6393.Nob, [Alphabet.Latin]),
-			[Bosnian] = new(Api.IsoCode6391.Bs, Api.IsoCode6393.Bos, [Alphabet.Latin]),
-			[Bulgarian] = new(Api.IsoCode6391.Bg, Api.IsoCode6393.Bul, [Alphabet.Cyrillic]),
-			[Catalan] = new(Api.IsoCode6391.Ca, Api.IsoCode6393.Cat, [Alphabet.Latin], "Ïï"),
-			[Chinese] = new(Api.IsoCode6391.Zh, Api.IsoCode6393.Zho, [Alphabet.Han]),
-			[Croatian] = new(Api.IsoCode6391.Hr, Api.IsoCode6393.Hrv, [Alphabet.Latin]),
-			[Czech] = new(Api.IsoCode6391.Cs, Api.IsoCode6393.Ces, [Alphabet.Latin], "ĚěŘřŮů"),
-			[Danish] = new(Api.IsoCode6391.Da, Api.IsoCode6393.Dan, [Alphabet.Latin]),
-			[Dutch] = new(Api.IsoCode6391.Nl, Api.IsoCode6393.Nld, [Alphabet.Latin]),
-			[English] = new(Api.IsoCode6391.En, Api.IsoCode6393.Eng, [Alphabet.Latin]),
-			[Esperanto] = new(Api.IsoCode6391.Eo, Api.IsoCode6393.Epo, [Alphabet.Latin], "ĈĉĜĝĤĥĴĵŜŝŬŭ"),
-			[Estonian] = new(Api.IsoCode6391.Et, Api.IsoCode6393.Est, [Alphabet.Latin]),
-			[Finnish] = new(Api.IsoCode6391.Fi, Api.IsoCode6393.Fin, [Alphabet.Latin]),
-			[French] = new(Api.IsoCode6391.Fr, Api.IsoCode6393.Fra, [Alphabet.Latin]),
-			[Ganda] = new(Api.IsoCode6391.Lg, Api.IsoCode6393.Lug, [Alphabet.Latin]),
-			[Georgian] = new(Api.IsoCode6391.Ka, Api.IsoCode6393.Kat, [Alphabet.Georgian]),
-			[German] = new(Api.IsoCode6391.De, Api.IsoCode6393.Deu, [Alphabet.Latin], "ß"),
-			[Greek] = new(Api.IsoCode6391.El, Api.IsoCode6393.Ell, [Alphabet.Greek]),
-			[Gujarati] = new(Api.IsoCode6391.Gu, Api.IsoCode6393.Guj, [Alphabet.Gujarati]),
-			[Hebrew] = new(Api.IsoCode6391.He, Api.IsoCode6393.Heb, [Alphabet.Hebrew]),
-			[Hindi] = new(Api.IsoCode6391.Hi, Api.IsoCode6393.Hin, [Alphabet.Devanagari]),
-			[Hungarian] = new(Api.IsoCode6391.Hu, Api.IsoCode6393.Hun, [Alphabet.Latin], "ŐőŰű"),
-			[Icelandic] = new(Api.IsoCode6391.Is, Api.IsoCode6393.Isl, [Alphabet.Latin]),
-			[Indonesian] = new(Api.IsoCode6391.Id, Api.IsoCode6393.Ind, [Alphabet.Latin]),
-			[Irish] = new(Api.IsoCode6391.Ga, Api.IsoCode6393.Gle, [Alphabet.Latin]),
-			[Italian] = new(Api.IsoCode6391.It, Api.IsoCode6393.Ita, [Alphabet.Latin]),
-			[Japanese] = new(Api.IsoCode6391.Ja, Api.IsoCode6393.Jpn, [Alphabet.Hiragana, Alphabet.Katakana, Alphabet.Han]),
-			[Kazakh] = new(Api.IsoCode6391.Kk, Api.IsoCode6393.Kaz, [Alphabet.Cyrillic], "ӘәҒғҚқҢңҰұ"),
-			[Korean] = new(Api.IsoCode6391.Ko, Api.IsoCode6393.Kor, [Alphabet.Hangul]),
-			[Latin] = new(Api.IsoCode6391.La, Api.IsoCode6393.Lat, [Alphabet.Latin]),
-			[Latvian] = new(Api.IsoCode6391.Lv, Api.IsoCode6393.Lav, [Alphabet.Latin], "ĢģĶķĻļŅņ"),
-			[Lithuanian] = new(Api.IsoCode6391.Lt, Api.IsoCode6393.Lit, [Alphabet.Latin], "ĖėĮįŲų"),
-			[Macedonian] = new(Api.IsoCode6391.Mk, Api.IsoCode6393.Mkd, [Alphabet.Cyrillic], "ЃѓЅѕЌќЏџ"),
-			[Malay] = new(Api.IsoCode6391.Ms, Api.IsoCode6393.Msa, [Alphabet.Latin]),
-			[Maori] = new(Api.IsoCode6391.Mi, Api.IsoCode6393.Mri, [Alphabet.Latin]),
-			[Marathi] = new(Api.IsoCode6391.Mr, Api.IsoCode6393.Mar, [Alphabet.Devanagari], "ळ"),
-			[Mongolian] = new(Api.IsoCode6391.Mn, Api.IsoCode6393.Mon, [Alphabet.Cyrillic], "ӨөҮү"),
-			[Nynorsk] = new(Api.IsoCode6391.Nn, Api.IsoCode6393.Nno, [Alphabet.Latin]),
-			[Oromo] = new(Api.IsoCode6391.Om, Api.IsoCode6393.Orm, [Alphabet.Latin]),
-			[Persian] = new(Api.IsoCode6391.Fa, Api.IsoCode6393.Fas, [Alphabet.Arabic]),
-			[Polish] = new(Api.IsoCode6391.Pl, Api.IsoCode6393.Pol, [Alphabet.Latin], "ŁłŃńŚśŹź"),
-			[Portuguese] = new(Api.IsoCode6391.Pt, Api.IsoCode6393.Por, [Alphabet.Latin]),
-			[Punjabi] = new(Api.IsoCode6391.Pa, Api.IsoCode6393.Pan, [Alphabet.Gurmukhi]),
-			[Romanian] = new(Api.IsoCode6391.Ro, Api.IsoCode6393.Ron, [Alphabet.Latin], "Țţ"),
-			[Russian] = new(Api.IsoCode6391.Ru, Api.IsoCode6393.Rus, [Alphabet.Cyrillic]),
-			[Serbian] = new(Api.IsoCode6391.Sr, Api.IsoCode6393.Srp, [Alphabet.Cyrillic], "ЂђЋћ"),
-			[Shona] = new(Api.IsoCode6391.Sn, Api.IsoCode6393.Sna, [Alphabet.Latin]),
-			[Sinhala] = new(Api.IsoCode6391.Si, Api.IsoCode6393.Sin, [Alphabet.Sinhala]),
-			[Slovak] = new(Api.IsoCode6391.Sk, Api.IsoCode6393.Slk, [Alphabet.Latin], "ĹĺĽľŔŕ"),
-			[Slovene] = new(Api.IsoCode6391.Sl, Api.IsoCode6393.Slv, [Alphabet.Latin]),
-			[Somali] = new(Api.IsoCode6391.So, Api.IsoCode6393.Som, [Alphabet.Latin]),
-			[Sotho] = new(Api.IsoCode6391.St, Api.IsoCode6393.Sot, [Alphabet.Latin]),
-			[Spanish] = new(Api.IsoCode6391.Es, Api.IsoCode6393.Spa, [Alphabet.Latin], "¿¡"),
-			[Swahili] = new(Api.IsoCode6391.Sw, Api.IsoCode6393.Swa, [Alphabet.Latin]),
-			[Swedish] = new(Api.IsoCode6391.Sv, Api.IsoCode6393.Swe, [Alphabet.Latin]),
-			[Tagalog] = new(Api.IsoCode6391.Tl, Api.IsoCode6393.Tgl, [Alphabet.Latin]),
-			[Tamil] = new(Api.IsoCode6391.Ta, Api.IsoCode6393.Tam, [Alphabet.Tamil]),
-			[Telugu] = new(Api.IsoCode6391.Te, Api.IsoCode6393.Tel, [Alphabet.Telugu]),
-			[Thai] = new(Api.IsoCode6391.Th, Api.IsoCode6393.Tha, [Alphabet.Thai]),
-			[Tigrinya] = new(Api.IsoCode6391.Ti, Api.IsoCode6393.Tir, [Alphabet.Ethiopic]),
-			[Tsonga] = new(Api.IsoCode6391.Ts, Api.IsoCode6393.Tso, [Alphabet.Latin]),
-			[Tswana] = new(Api.IsoCode6391.Tn, Api.IsoCode6393.Tsn, [Alphabet.Latin]),
-			[Turkish] = new(Api.IsoCode6391.Tr, Api.IsoCode6393.Tur, [Alphabet.Latin]),
-			[Ukrainian] = new(Api.IsoCode6391.Uk, Api.IsoCode6393.Ukr, [Alphabet.Cyrillic], "ҐґЄєЇї"),
-			[Urdu] = new(Api.IsoCode6391.Ur, Api.IsoCode6393.Urd, [Alphabet.Arabic]),
-			[Vietnamese] = new(Api.IsoCode6391.Vi, Api.IsoCode6393.Vie, [Alphabet.Latin], "ẰằẦầẲẳẨẩẴẵẪẫẮắẤấẠạẶặẬậỀềẺẻỂểẼẽỄễẾếỆệỈỉĨĩỊịƠơỒồỜờỎỏỔổỞởỖỗỠỡỐốỚớỘộỢợƯưỪừỦủỬửŨũỮữỨứỤụỰựỲỳỶỷỸỹỴỵ"),
-			[Welsh] = new(Api.IsoCode6391.Cy, Api.IsoCode6393.Cym, [Alphabet.Latin]),
-			[Xhosa] = new(Api.IsoCode6391.Xh, Api.IsoCode6393.Xho, [Alphabet.Latin]),
+			[Afrikaans] = new(Lingua.IsoCode6391.Af, Lingua.IsoCode6393.Afr, [Alphabet.Latin]),
+			[Albanian] = new(Lingua.IsoCode6391.Sq, Lingua.IsoCode6393.Sqi, [Alphabet.Latin]),
+			[Amharic] = new(Lingua.IsoCode6391.Am, Lingua.IsoCode6393.Amh, [Alphabet.Ethiopic]),
+			[Arabic] = new(Lingua.IsoCode6391.Ar, Lingua.IsoCode6393.Ara, [Alphabet.Arabic]),
+			[Armenian] = new(Lingua.IsoCode6391.Hy, Lingua.IsoCode6393.Hye, [Alphabet.Armenian]),
+			[Azerbaijani] = new(Lingua.IsoCode6391.Az, Lingua.IsoCode6393.Aze, [Alphabet.Latin], "Əə"),
+			[Basque] = new(Lingua.IsoCode6391.Eu, Lingua.IsoCode6393.Eus, [Alphabet.Latin]),
+			[Belarusian] = new(Lingua.IsoCode6391.Be, Lingua.IsoCode6393.Bel, [Alphabet.Cyrillic]),
+			[Bengali] = new(Lingua.IsoCode6391.Bn, Lingua.IsoCode6393.Ben, [Alphabet.Bengali]),
+			[Bokmal] = new(Lingua.IsoCode6391.Nb, Lingua.IsoCode6393.Nob, [Alphabet.Latin]),
+			[Bosnian] = new(Lingua.IsoCode6391.Bs, Lingua.IsoCode6393.Bos, [Alphabet.Latin]),
+			[Bulgarian] = new(Lingua.IsoCode6391.Bg, Lingua.IsoCode6393.Bul, [Alphabet.Cyrillic]),
+			[Catalan] = new(Lingua.IsoCode6391.Ca, Lingua.IsoCode6393.Cat, [Alphabet.Latin], "Ïï"),
+			[Chinese] = new(Lingua.IsoCode6391.Zh, Lingua.IsoCode6393.Zho, [Alphabet.Han]),
+			[Croatian] = new(Lingua.IsoCode6391.Hr, Lingua.IsoCode6393.Hrv, [Alphabet.Latin]),
+			[Czech] = new(Lingua.IsoCode6391.Cs, Lingua.IsoCode6393.Ces, [Alphabet.Latin], "ĚěŘřŮů"),
+			[Danish] = new(Lingua.IsoCode6391.Da, Lingua.IsoCode6393.Dan, [Alphabet.Latin]),
+			[Dutch] = new(Lingua.IsoCode6391.Nl, Lingua.IsoCode6393.Nld, [Alphabet.Latin]),
+			[English] = new(Lingua.IsoCode6391.En, Lingua.IsoCode6393.Eng, [Alphabet.Latin]),
+			[Esperanto] = new(Lingua.IsoCode6391.Eo, Lingua.IsoCode6393.Epo, [Alphabet.Latin], "ĈĉĜĝĤĥĴĵŜŝŬŭ"),
+			[Estonian] = new(Lingua.IsoCode6391.Et, Lingua.IsoCode6393.Est, [Alphabet.Latin]),
+			[Finnish] = new(Lingua.IsoCode6391.Fi, Lingua.IsoCode6393.Fin, [Alphabet.Latin]),
+			[French] = new(Lingua.IsoCode6391.Fr, Lingua.IsoCode6393.Fra, [Alphabet.Latin]),
+			[Ganda] = new(Lingua.IsoCode6391.Lg, Lingua.IsoCode6393.Lug, [Alphabet.Latin]),
+			[Georgian] = new(Lingua.IsoCode6391.Ka, Lingua.IsoCode6393.Kat, [Alphabet.Georgian]),
+			[German] = new(Lingua.IsoCode6391.De, Lingua.IsoCode6393.Deu, [Alphabet.Latin], "ß"),
+			[Greek] = new(Lingua.IsoCode6391.El, Lingua.IsoCode6393.Ell, [Alphabet.Greek]),
+			[Gujarati] = new(Lingua.IsoCode6391.Gu, Lingua.IsoCode6393.Guj, [Alphabet.Gujarati]),
+			[Hebrew] = new(Lingua.IsoCode6391.He, Lingua.IsoCode6393.Heb, [Alphabet.Hebrew]),
+			[Hindi] = new(Lingua.IsoCode6391.Hi, Lingua.IsoCode6393.Hin, [Alphabet.Devanagari]),
+			[Hungarian] = new(Lingua.IsoCode6391.Hu, Lingua.IsoCode6393.Hun, [Alphabet.Latin], "ŐőŰű"),
+			[Icelandic] = new(Lingua.IsoCode6391.Is, Lingua.IsoCode6393.Isl, [Alphabet.Latin]),
+			[Indonesian] = new(Lingua.IsoCode6391.Id, Lingua.IsoCode6393.Ind, [Alphabet.Latin]),
+			[Irish] = new(Lingua.IsoCode6391.Ga, Lingua.IsoCode6393.Gle, [Alphabet.Latin]),
+			[Italian] = new(Lingua.IsoCode6391.It, Lingua.IsoCode6393.Ita, [Alphabet.Latin]),
+			[Japanese] = new(Lingua.IsoCode6391.Ja, Lingua.IsoCode6393.Jpn, [Alphabet.Hiragana, Alphabet.Katakana, Alphabet.Han]),
+			[Kazakh] = new(Lingua.IsoCode6391.Kk, Lingua.IsoCode6393.Kaz, [Alphabet.Cyrillic], "ӘәҒғҚқҢңҰұ"),
+			[Korean] = new(Lingua.IsoCode6391.Ko, Lingua.IsoCode6393.Kor, [Alphabet.Hangul]),
+			[Latin] = new(Lingua.IsoCode6391.La, Lingua.IsoCode6393.Lat, [Alphabet.Latin]),
+			[Latvian] = new(Lingua.IsoCode6391.Lv, Lingua.IsoCode6393.Lav, [Alphabet.Latin], "ĢģĶķĻļŅņ"),
+			[Lithuanian] = new(Lingua.IsoCode6391.Lt, Lingua.IsoCode6393.Lit, [Alphabet.Latin], "ĖėĮįŲų"),
+			[Macedonian] = new(Lingua.IsoCode6391.Mk, Lingua.IsoCode6393.Mkd, [Alphabet.Cyrillic], "ЃѓЅѕЌќЏџ"),
+			[Malay] = new(Lingua.IsoCode6391.Ms, Lingua.IsoCode6393.Msa, [Alphabet.Latin]),
+			[Maori] = new(Lingua.IsoCode6391.Mi, Lingua.IsoCode6393.Mri, [Alphabet.Latin]),
+			[Marathi] = new(Lingua.IsoCode6391.Mr, Lingua.IsoCode6393.Mar, [Alphabet.Devanagari], "ळ"),
+			[Mongolian] = new(Lingua.IsoCode6391.Mn, Lingua.IsoCode6393.Mon, [Alphabet.Cyrillic], "ӨөҮү"),
+			[Nynorsk] = new(Lingua.IsoCode6391.Nn, Lingua.IsoCode6393.Nno, [Alphabet.Latin]),
+			[Oromo] = new(Lingua.IsoCode6391.Om, Lingua.IsoCode6393.Orm, [Alphabet.Latin]),
+			[Persian] = new(Lingua.IsoCode6391.Fa, Lingua.IsoCode6393.Fas, [Alphabet.Arabic]),
+			[Polish] = new(Lingua.IsoCode6391.Pl, Lingua.IsoCode6393.Pol, [Alphabet.Latin], "ŁłŃńŚśŹź"),
+			[Portuguese] = new(Lingua.IsoCode6391.Pt, Lingua.IsoCode6393.Por, [Alphabet.Latin]),
+			[Punjabi] = new(Lingua.IsoCode6391.Pa, Lingua.IsoCode6393.Pan, [Alphabet.Gurmukhi]),
+			[Romanian] = new(Lingua.IsoCode6391.Ro, Lingua.IsoCode6393.Ron, [Alphabet.Latin], "Țţ"),
+			[Russian] = new(Lingua.IsoCode6391.Ru, Lingua.IsoCode6393.Rus, [Alphabet.Cyrillic]),
+			[Serbian] = new(Lingua.IsoCode6391.Sr, Lingua.IsoCode6393.Srp, [Alphabet.Cyrillic], "ЂђЋћ"),
+			[Shona] = new(Lingua.IsoCode6391.Sn, Lingua.IsoCode6393.Sna, [Alphabet.Latin]),
+			[Sinhala] = new(Lingua.IsoCode6391.Si, Lingua.IsoCode6393.Sin, [Alphabet.Sinhala]),
+			[Slovak] = new(Lingua.IsoCode6391.Sk, Lingua.IsoCode6393.Slk, [Alphabet.Latin], "ĹĺĽľŔŕ"),
+			[Slovene] = new(Lingua.IsoCode6391.Sl, Lingua.IsoCode6393.Slv, [Alphabet.Latin]),
+			[Somali] = new(Lingua.IsoCode6391.So, Lingua.IsoCode6393.Som, [Alphabet.Latin]),
+			[Sotho] = new(Lingua.IsoCode6391.St, Lingua.IsoCode6393.Sot, [Alphabet.Latin]),
+			[Spanish] = new(Lingua.IsoCode6391.Es, Lingua.IsoCode6393.Spa, [Alphabet.Latin], "¿¡"),
+			[Swahili] = new(Lingua.IsoCode6391.Sw, Lingua.IsoCode6393.Swa, [Alphabet.Latin]),
+			[Swedish] = new(Lingua.IsoCode6391.Sv, Lingua.IsoCode6393.Swe, [Alphabet.Latin]),
+			[Tagalog] = new(Lingua.IsoCode6391.Tl, Lingua.IsoCode6393.Tgl, [Alphabet.Latin]),
+			[Tamil] = new(Lingua.IsoCode6391.Ta, Lingua.IsoCode6393.Tam, [Alphabet.Tamil]),
+			[Telugu] = new(Lingua.IsoCode6391.Te, Lingua.IsoCode6393.Tel, [Alphabet.Telugu]),
+			[Thai] = new(Lingua.IsoCode6391.Th, Lingua.IsoCode6393.Tha, [Alphabet.Thai]),
+			[Tigrinya] = new(Lingua.IsoCode6391.Ti, Lingua.IsoCode6393.Tir, [Alphabet.Ethiopic]),
+			[Tsonga] = new(Lingua.IsoCode6391.Ts, Lingua.IsoCode6393.Tso, [Alphabet.Latin]),
+			[Tswana] = new(Lingua.IsoCode6391.Tn, Lingua.IsoCode6393.Tsn, [Alphabet.Latin]),
+			[Turkish] = new(Lingua.IsoCode6391.Tr, Lingua.IsoCode6393.Tur, [Alphabet.Latin]),
+			[Ukrainian] = new(Lingua.IsoCode6391.Uk, Lingua.IsoCode6393.Ukr, [Alphabet.Cyrillic], "ҐґЄєЇї"),
+			[Urdu] = new(Lingua.IsoCode6391.Ur, Lingua.IsoCode6393.Urd, [Alphabet.Arabic]),
+			[Vietnamese] = new(Lingua.IsoCode6391.Vi, Lingua.IsoCode6393.Vie, [Alphabet.Latin], "ẰằẦầẲẳẨẩẴẵẪẫẮắẤấẠạẶặẬậỀềẺẻỂểẼẽỄễẾếỆệỈỉĨĩỊịƠơỒồỜờỎỏỔổỞởỖỗỠỡỐốỚớỘộỢợƯưỪừỦủỬửŨũỮữỨứỤụỰựỲỳỶỷỸỹỴỵ"),
+			[Welsh] = new(Lingua.IsoCode6391.Cy, Lingua.IsoCode6393.Cym, [Alphabet.Latin]),
+			[Xhosa] = new(Lingua.IsoCode6391.Xh, Lingua.IsoCode6393.Xho, [Alphabet.Latin]),
 			// TODO for YORUBA: "E̩e̩Ẹ́ẹ́É̩é̩Ẹ̀ẹ̀È̩è̩Ẹ̄ẹ̄Ē̩ē̩ŌōO̩o̩Ọ́ọ́Ó̩ó̩Ọ̀ọ̀Ò̩ò̩Ọ̄ọ̄Ō̩ō̩ṢṣS̩s̩"
-			[Yoruba] = new(Api.IsoCode6391.Yo, Api.IsoCode6393.Yor, [Alphabet.Latin], "Ṣṣ"),
-			[Zulu] = new(Api.IsoCode6391.Zu, Api.IsoCode6393.Zul, [Alphabet.Latin]),
-			[Unknown] = new(Api.IsoCode6391.None, Api.IsoCode6393.None, [Alphabet.None])
+			[Yoruba] = new(Lingua.IsoCode6391.Yo, Lingua.IsoCode6393.Yor, [Alphabet.Latin], "Ṣṣ"),
+			[Zulu] = new(Lingua.IsoCode6391.Zu, Lingua.IsoCode6393.Zul, [Alphabet.Latin]),
+			[Unknown] = new(Lingua.IsoCode6391.None, Lingua.IsoCode6393.None, [Alphabet.None])
 		};
 
 	/// <summary>

diff --git a/src/Lingua/Api/LanguageDetector.cs → src/Lingua/LanguageDetector.cs b/src/Lingua/Api/LanguageDetector.cs → src/Lingua/LanguageDetector.cs
@@ -1,12 +1,10 @@
 using System.Collections.Concurrent;
-using System.Collections.Frozen;
 using System.IO.Compression;
-using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Lingua.Internal;
-using static Lingua.Api.Language;
+using static Lingua.Language;
 
-namespace Lingua.Api;
+namespace Lingua;
 
 /// <summary>
 /// Detects language of given input text, and computes confidence values for every language considered possible

diff --git a/src/Lingua/Api/LanguageDetectorBuilder.cs → src/Lingua/LanguageDetectorBuilder.cs b/src/Lingua/Api/LanguageDetectorBuilder.cs → src/Lingua/LanguageDetectorBuilder.cs
@@ -1,7 +1,7 @@
-namespace Lingua.Api;
+namespace Lingua;
 
 /// <summary>
-/// Builder for <see cref="LanguageDetector"/>
+/// Builder for <see cref="Lingua.LanguageDetector"/>
 /// </summary>
 public class LanguageDetectorBuilder
 {
@@ -125,7 +125,7 @@ public LanguageDetectorBuilder WithMinimumRelativeDistance(double distance)
 	}
 
 	/// <summary>
-	/// Preloads all language models when creating the instance of <see cref="LanguageDetector"/>.
+	/// Preloads all language models when creating the instance of <see cref="Lingua.LanguageDetector"/>.
 	/// <para />
 	/// By default, *Lingua* uses lazy-loading to load only those language models
 	/// on demand which are considered relevant by the rule-based filter engine.
@@ -159,10 +159,10 @@ public LanguageDetectorBuilder WithLowAccuracyMode()
 	}
 
 	/// <summary>
-	/// Builds a new instance of <see cref="LanguageDetector"/>.
+	/// Builds a new instance of <see cref="Lingua.LanguageDetector"/>.
 	/// </summary>
-	/// <returns>a new instance of <see cref="LanguageDetector"/></returns>
-	public LanguageDetector Build() =>
+	/// <returns>a new instance of <see cref="Lingua.LanguageDetector"/></returns>
+	public Lingua.LanguageDetector Build() =>
 		new(_languages,
 			_minimumRelativeDistance,
 			_isEveryLanguageModelPreloaded,