diff --git a/common-documentation/linux/charsets.go b/common-documentation/linux-charsets.go
similarity index 99%
rename from common-documentation/linux/charsets.go
rename to common-documentation/linux-charsets.go
index 123c7ea..a72dfe9 100644
--- a/common-documentation/linux/charsets.go
+++ b/common-documentation/linux-charsets.go
@@ -2,7 +2,7 @@ package commondocumentation
 
 import docvalues "config-lsp/doc-values"
 
-var CharsetsDocumentation = []docvalues.EnumString{
+var AvailableCharsets = []docvalues.EnumString{
 	docvalues.CreateEnumStringWithDoc(
 		"ascii",
 		`ASCII (American Standard Code For Information Interchange) is the
diff --git a/common-documentation/filesystems/mountoptions/adfs.go b/common-documentation/mnt-adfs.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/adfs.go
rename to common-documentation/mnt-adfs.go
diff --git a/common-documentation/filesystems/mountoptions/affs.go b/common-documentation/mnt-affs.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/affs.go
rename to common-documentation/mnt-affs.go
diff --git a/common-documentation/filesystems/mountoptions/debugfs.go b/common-documentation/mnt-debugfs.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/debugfs.go
rename to common-documentation/mnt-debugfs.go
diff --git a/common-documentation/filesystems/mountoptions/devpts.go b/common-documentation/mnt-devpts.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/devpts.go
rename to common-documentation/mnt-devpts.go
diff --git a/common-documentation/filesystems/mountoptions/ext2.go b/common-documentation/mnt-ext2.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/ext2.go
rename to common-documentation/mnt-ext2.go
diff --git a/common-documentation/filesystems/mountoptions/ext3.go b/common-documentation/mnt-ext3.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/ext3.go
rename to common-documentation/mnt-ext3.go
diff --git a/common-documentation/filesystems/mountoptions/ext4.go b/common-documentation/mnt-ext4.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/ext4.go
rename to common-documentation/mnt-ext4.go
diff --git a/common-documentation/filesystems/mountoptions/fat.go b/common-documentation/mnt-fat.go
similarity index 98%
rename from common-documentation/filesystems/mountoptions/fat.go
rename to common-documentation/mnt-fat.go
index 19936c4..4c1e587 100644
--- a/common-documentation/filesystems/mountoptions/fat.go
+++ b/common-documentation/mnt-fat.go
@@ -1,6 +1,8 @@
 package commondocumentation
 
-import docvalues "config-lsp/doc-values"
+import (
+	docvalues "config-lsp/doc-values"
+)
 
 var FatDocumentationAssignable = map[docvalues.EnumString]docvalues.Value{
 	docvalues.CreateEnumStringWithDoc(
@@ -104,8 +106,10 @@ var FatDocumentationAssignable = map[docvalues.EnumString]docvalues.Value{
 	docvalues.CreateEnumStringWithDoc(
 		"iocharset",
 		"Character set to use for converting between 8 bit characters and 16 bit Unicode characters. The default is iso8859-1. Long filenames are stored on disk in Unicode format.",
-	// TODO: Use enum for charsets
-	): docvalues.StringValue{},
+	): docvalues.EnumValue{
+		EnforceValues: true,
+		Values:        AvailableCharsets,
+	},
 	docvalues.CreateEnumStringWithDoc(
 		"nfs",
 		`Enable this only if you want to export the FAT filesystem over NFS.
diff --git a/common-documentation/filesystems/mountoptions/hfs.go b/common-documentation/mnt-hfs.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/hfs.go
rename to common-documentation/mnt-hfs.go
diff --git a/common-documentation/filesystems/mountoptions/hpfs.go b/common-documentation/mnt-hpfs.go
similarity index 100%
rename from common-documentation/filesystems/mountoptions/hpfs.go
rename to common-documentation/mnt-hpfs.go