diff --git a/data/humans/neutralNames.json b/data/humans/names/neutral.json
similarity index 100%
rename from data/humans/neutralNames.json
rename to data/humans/names/neutral.json
diff --git a/data/humans/norwayFirstNamesGirls.json b/data/humans/names/norwayFemale.json
similarity index 100%
rename from data/humans/norwayFirstNamesGirls.json
rename to data/humans/names/norwayFemale.json
diff --git a/data/humans/norwayFirstNamesBoys.json b/data/humans/names/norwayMale.json
similarity index 100%
rename from data/humans/norwayFirstNamesBoys.json
rename to data/humans/names/norwayMale.json
diff --git a/data/humans/norwayLastNames.json b/data/humans/names/norwaySurnames.json
similarity index 100%
rename from data/humans/norwayLastNames.json
rename to data/humans/names/norwaySurnames.json
diff --git a/data/humans/spanishFirstNames.json b/data/humans/names/spanish.json
similarity index 100%
rename from data/humans/spanishFirstNames.json
rename to data/humans/names/spanish.json
diff --git a/data/humans/spanishLastNames.json b/data/humans/names/spanishSurnames.json
similarity index 100%
rename from data/humans/spanishLastNames.json
rename to data/humans/names/spanishSurnames.json
diff --git a/data/humans/tolkienCharacterNames.json b/data/humans/names/tolkien.json
similarity index 100%
rename from data/humans/tolkienCharacterNames.json
rename to data/humans/names/tolkien.json
diff --git a/data/humans/firstNames.json b/data/humans/names/usa.json
similarity index 100%
rename from data/humans/firstNames.json
rename to data/humans/names/usa.json
diff --git a/data/humans/lastNames.json b/data/humans/names/usaSurnames.json
similarity index 100%
rename from data/humans/lastNames.json
rename to data/humans/names/usaSurnames.json