diff --git a/data/dictionaries/IATA_airport_codes.csv b/data/dicts/IATA_airport_codes.csv
similarity index 100%
rename from data/dictionaries/IATA_airport_codes.csv
rename to data/dicts/IATA_airport_codes.csv
diff --git a/data/dictionaries/ICAO_airport_codes.csv b/data/dicts/ICAO_airport_codes.csv
similarity index 100%
rename from data/dictionaries/ICAO_airport_codes.csv
rename to data/dicts/ICAO_airport_codes.csv
diff --git a/data/dictionaries/ICD-10_diagnosis_codes.csv b/data/dicts/ICD-10_diagnosis_codes.csv
similarity index 100%
rename from data/dictionaries/ICD-10_diagnosis_codes.csv
rename to data/dicts/ICD-10_diagnosis_codes.csv
diff --git a/data/dictionaries/ISO_country_codes.csv b/data/dicts/ISO_country_codes.csv
similarity index 100%
rename from data/dictionaries/ISO_country_codes.csv
rename to data/dicts/ISO_country_codes.csv
diff --git a/data/dictionaries/ISO_currency_codes.csv b/data/dicts/ISO_currency_codes.csv
similarity index 100%
rename from data/dictionaries/ISO_currency_codes.csv
rename to data/dicts/ISO_currency_codes.csv
diff --git a/data/dictionaries/ISO_language_codes.csv b/data/dicts/ISO_language_codes.csv
similarity index 100%
rename from data/dictionaries/ISO_language_codes.csv
rename to data/dicts/ISO_language_codes.csv
diff --git a/data/dictionaries/SI_prefixes.csv b/data/dicts/SI_prefixes.csv
similarity index 100%
rename from data/dictionaries/SI_prefixes.csv
rename to data/dicts/SI_prefixes.csv
diff --git a/data/dictionaries/astronomy.csv b/data/dicts/astronomy.csv
similarity index 99%
rename from data/dictionaries/astronomy.csv
rename to data/dicts/astronomy.csv
index 1ffc3821..481cd27a 100644
--- a/data/dictionaries/astronomy.csv
+++ b/data/dicts/astronomy.csv
@@ -281,7 +281,6 @@ NACO,NAOS-CONICA (VLT)
 NAOJ,National Astronomical Observatory of Japan
 NAOMI,Adaptive optics system for the ATs (VLTI)
 NAOS,Nasmyth Adaptive Optics System (VLT)
-NASA,National Aeronautics and Space Administration
 NAV,Navision
 NDF,Non-Deliverable Forward Agreement
 NEAR,New Earths in the Alpha Cen Region experiment
diff --git a/data/dictionaries/aviation.csv b/data/dicts/aviation.csv
similarity index 100%
rename from data/dictionaries/aviation.csv
rename to data/dicts/aviation.csv
diff --git a/data/dictionaries/biology.csv b/data/dicts/biology.csv
similarity index 100%
rename from data/dictionaries/biology.csv
rename to data/dicts/biology.csv
diff --git a/data/dictionaries/chemistry.csv b/data/dicts/chemistry.csv
similarity index 100%
rename from data/dictionaries/chemistry.csv
rename to data/dicts/chemistry.csv
diff --git a/data/dictionaries/color_names.csv b/data/dicts/color_names.csv
similarity index 100%
rename from data/dictionaries/color_names.csv
rename to data/dicts/color_names.csv
diff --git a/data/dictionaries/companies.csv b/data/dicts/companies.csv
similarity index 100%
rename from data/dictionaries/companies.csv
rename to data/dicts/companies.csv
diff --git a/data/dictionaries/computing.csv b/data/dicts/computing.csv
similarity index 100%
rename from data/dictionaries/computing.csv
rename to data/dicts/computing.csv
diff --git a/data/dictionaries/cooking.csv b/data/dicts/cooking.csv
similarity index 100%
rename from data/dictionaries/cooking.csv
rename to data/dicts/cooking.csv
diff --git a/data/dictionaries/english_dictionary.csv b/data/dicts/english_dictionary.csv
similarity index 100%
rename from data/dictionaries/english_dictionary.csv
rename to data/dicts/english_dictionary.csv
diff --git a/data/dictionaries/financial.csv b/data/dicts/financial.csv
similarity index 100%
rename from data/dictionaries/financial.csv
rename to data/dicts/financial.csv
diff --git a/data/dictionaries/general.csv b/data/dicts/general.csv
similarity index 99%
rename from data/dictionaries/general.csv
rename to data/dicts/general.csv
index 890b168f..8edd7a2f 100644
--- a/data/dictionaries/general.csv
+++ b/data/dicts/general.csv
@@ -790,7 +790,7 @@ CHRS,Canadian Heart Rhythm Society
 CHT,Certified Hand Therapist
 CI,"Côte d'Ivoire (ISO 3166 digram),Counter-Intelligence,101 (in Roman numerals)"
 Ci,Curie
-CIA,"U.S. Central Intelligence Agency, Cairo International Airport, Culinary Institute of America"
+CIA,"Cairo International Airport, Culinary Institute of America"
 CIAO,"Critical Infrastructure Assurance Office,Component-Integrated ACE ORB"
 CIB,Complete In Box (Internet auction/trading listings)
 CIBC,Canadian Imperial Bank of Commerce
diff --git a/data/dictionaries/geography.csv b/data/dicts/geography.csv
similarity index 100%
rename from data/dictionaries/geography.csv
rename to data/dicts/geography.csv
diff --git a/data/dictionaries/history.csv b/data/dicts/history.csv
similarity index 100%
rename from data/dictionaries/history.csv
rename to data/dicts/history.csv
diff --git a/data/dictionaries/mathematics.csv b/data/dicts/mathematics.csv
similarity index 100%
rename from data/dictionaries/mathematics.csv
rename to data/dicts/mathematics.csv
diff --git a/data/dictionaries/medical.csv b/data/dicts/medical.csv
similarity index 100%
rename from data/dictionaries/medical.csv
rename to data/dicts/medical.csv
diff --git a/data/dictionaries/military.csv b/data/dicts/military.csv
similarity index 100%
rename from data/dictionaries/military.csv
rename to data/dicts/military.csv
diff --git a/data/dictionaries/music.csv b/data/dicts/music.csv
similarity index 100%
rename from data/dictionaries/music.csv
rename to data/dicts/music.csv
diff --git a/data/dictionaries/organizations.csv b/data/dicts/organizations.csv
similarity index 97%
rename from data/dictionaries/organizations.csv
rename to data/dicts/organizations.csv
index 90ab2f6e..5f955edd 100644
--- a/data/dictionaries/organizations.csv
+++ b/data/dicts/organizations.csv
@@ -13,6 +13,8 @@ BMW, Bavarian Motor Works
 BND,Bundesnachrichtendienst (Germany)
 BVD, Bradley, Voorhees, and Day
 CERN,European Organization for Nuclear Research
+CIA,U.S. Central Intelligence Agency
+CPUC,California Public Utilities Commission
 DOC,U.S. Department of Commerce
 DOD,U.S. Department of Defense
 DOE,U.S. Department of Energy
diff --git a/data/dictionaries/sports.csv b/data/dicts/sports.csv
similarity index 100%
rename from data/dictionaries/sports.csv
rename to data/dicts/sports.csv
diff --git a/scripts/what-is.ps1 b/scripts/what-is.ps1
index 2f2f849b..51508856 100755
--- a/scripts/what-is.ps1
+++ b/scripts/what-is.ps1
@@ -18,7 +18,7 @@ param([string]$term = "")
 
 try {
 	if ($term -eq "" ) { $term = Read-Host "Enter the term/abbreviation/etc. to query" }
-	$files = (Get-ChildItem "$PSScriptRoot/../data/dictionaries/*.csv")
+	$files = (Get-ChildItem "$PSScriptRoot/../data/dicts/*.csv")
 	$basename = ""
 	foreach($file in $files) {
 		$table = Import-CSV "$file"