diff --git a/data/wordlists/bip39_en_wordlist.txt b/data/bip39_en_wordlist.txt
similarity index 100%
rename from data/wordlists/bip39_en_wordlist.txt
rename to data/bip39_en_wordlist.txt
diff --git a/data/wordlists/eff_large_wordlist.txt b/data/eff_large_wordlist.txt
similarity index 100%
rename from data/wordlists/eff_large_wordlist.txt
rename to data/eff_large_wordlist.txt
diff --git a/data/wordlists/eff_short_wordlist_1.txt b/data/eff_short_wordlist_1.txt
similarity index 100%
rename from data/wordlists/eff_short_wordlist_1.txt
rename to data/eff_short_wordlist_1.txt
diff --git a/data/wordlists/eff_short_wordlist_2_0.txt b/data/eff_short_wordlist_2_0.txt
similarity index 100%
rename from data/wordlists/eff_short_wordlist_2_0.txt
rename to data/eff_short_wordlist_2_0.txt
diff --git a/data/wordlists/moby/readme.txt b/data/moby/readme.txt
similarity index 100%
rename from data/wordlists/moby/readme.txt
rename to data/moby/readme.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mhyph/mhyph.txt b/data/moby/share/ilash/common/Packages/Moby/mhyph/mhyph.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mhyph/mhyph.txt
rename to data/moby/share/ilash/common/Packages/Moby/mhyph/mhyph.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mhyph/readme b/data/moby/share/ilash/common/Packages/Moby/mhyph/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mhyph/readme
rename to data/moby/share/ilash/common/Packages/Moby/mhyph/readme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/french.txt b/data/moby/share/ilash/common/Packages/Moby/mlang/french.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/french.txt
rename to data/moby/share/ilash/common/Packages/Moby/mlang/french.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/german.txt b/data/moby/share/ilash/common/Packages/Moby/mlang/german.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/german.txt
rename to data/moby/share/ilash/common/Packages/Moby/mlang/german.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/italian.txt b/data/moby/share/ilash/common/Packages/Moby/mlang/italian.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/italian.txt
rename to data/moby/share/ilash/common/Packages/Moby/mlang/italian.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/japanese.txt b/data/moby/share/ilash/common/Packages/Moby/mlang/japanese.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/japanese.txt
rename to data/moby/share/ilash/common/Packages/Moby/mlang/japanese.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/readme b/data/moby/share/ilash/common/Packages/Moby/mlang/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/readme
rename to data/moby/share/ilash/common/Packages/Moby/mlang/readme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/spanish.txt b/data/moby/share/ilash/common/Packages/Moby/mlang/spanish.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mlang/spanish.txt
rename to data/moby/share/ilash/common/Packages/Moby/mlang/spanish.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpos/mobyposi.i b/data/moby/share/ilash/common/Packages/Moby/mpos/mobyposi.i
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpos/mobyposi.i
rename to data/moby/share/ilash/common/Packages/Moby/mpos/mobyposi.i
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpos/readme b/data/moby/share/ilash/common/Packages/Moby/mpos/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpos/readme
rename to data/moby/share/ilash/common/Packages/Moby/mpos/readme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/cmudict0.3 b/data/moby/share/ilash/common/Packages/Moby/mpron/cmudict0.3
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/cmudict0.3
rename to data/moby/share/ilash/common/Packages/Moby/mpron/cmudict0.3
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/creadme b/data/moby/share/ilash/common/Packages/Moby/mpron/creadme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/creadme
rename to data/moby/share/ilash/common/Packages/Moby/mpron/creadme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/mobypron.unc b/data/moby/share/ilash/common/Packages/Moby/mpron/mobypron.unc
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/mobypron.unc
rename to data/moby/share/ilash/common/Packages/Moby/mpron/mobypron.unc
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/phoneset.3 b/data/moby/share/ilash/common/Packages/Moby/mpron/phoneset.3
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/phoneset.3
rename to data/moby/share/ilash/common/Packages/Moby/mpron/phoneset.3
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/readme b/data/moby/share/ilash/common/Packages/Moby/mpron/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mpron/readme
rename to data/moby/share/ilash/common/Packages/Moby/mpron/readme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mshak/readme b/data/moby/share/ilash/common/Packages/Moby/mshak/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mshak/readme
rename to data/moby/share/ilash/common/Packages/Moby/mshak/readme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mshak/shakespe.are b/data/moby/share/ilash/common/Packages/Moby/mshak/shakespe.are
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mshak/shakespe.are
rename to data/moby/share/ilash/common/Packages/Moby/mshak/shakespe.are
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mthes/mobythes.aur b/data/moby/share/ilash/common/Packages/Moby/mthes/mobythes.aur
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mthes/mobythes.aur
rename to data/moby/share/ilash/common/Packages/Moby/mthes/mobythes.aur
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mthes/readme b/data/moby/share/ilash/common/Packages/Moby/mthes/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mthes/readme
rename to data/moby/share/ilash/common/Packages/Moby/mthes/readme
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mthes/roget13a.txt b/data/moby/share/ilash/common/Packages/Moby/mthes/roget13a.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mthes/roget13a.txt
rename to data/moby/share/ilash/common/Packages/Moby/mthes/roget13a.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/10001fr.equ b/data/moby/share/ilash/common/Packages/Moby/mwords/10001fr.equ
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/10001fr.equ
rename to data/moby/share/ilash/common/Packages/Moby/mwords/10001fr.equ
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/10002fr.equ b/data/moby/share/ilash/common/Packages/Moby/mwords/10002fr.equ
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/10002fr.equ
rename to data/moby/share/ilash/common/Packages/Moby/mwords/10002fr.equ
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/10196pla.ces b/data/moby/share/ilash/common/Packages/Moby/mwords/10196pla.ces
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/10196pla.ces
rename to data/moby/share/ilash/common/Packages/Moby/mwords/10196pla.ces
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/113809of.fic b/data/moby/share/ilash/common/Packages/Moby/mwords/113809of.fic
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/113809of.fic
rename to data/moby/share/ilash/common/Packages/Moby/mwords/113809of.fic
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/1185kjvf.req b/data/moby/share/ilash/common/Packages/Moby/mwords/1185kjvf.req
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/1185kjvf.req
rename to data/moby/share/ilash/common/Packages/Moby/mwords/1185kjvf.req
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/21986na.mes b/data/moby/share/ilash/common/Packages/Moby/mwords/21986na.mes
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/21986na.mes
rename to data/moby/share/ilash/common/Packages/Moby/mwords/21986na.mes
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/256772co.mpo b/data/moby/share/ilash/common/Packages/Moby/mwords/256772co.mpo
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/256772co.mpo
rename to data/moby/share/ilash/common/Packages/Moby/mwords/256772co.mpo
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/354984si.ngl b/data/moby/share/ilash/common/Packages/Moby/mwords/354984si.ngl
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/354984si.ngl
rename to data/moby/share/ilash/common/Packages/Moby/mwords/354984si.ngl
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/366often.mis b/data/moby/share/ilash/common/Packages/Moby/mwords/366often.mis
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/366often.mis
rename to data/moby/share/ilash/common/Packages/Moby/mwords/366often.mis
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/3897male.nam b/data/moby/share/ilash/common/Packages/Moby/mwords/3897male.nam
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/3897male.nam
rename to data/moby/share/ilash/common/Packages/Moby/mwords/3897male.nam
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/4160offi.cia b/data/moby/share/ilash/common/Packages/Moby/mwords/4160offi.cia
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/4160offi.cia
rename to data/moby/share/ilash/common/Packages/Moby/mwords/4160offi.cia
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/467popul.arf b/data/moby/share/ilash/common/Packages/Moby/mwords/467popul.arf
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/467popul.arf
rename to data/moby/share/ilash/common/Packages/Moby/mwords/467popul.arf
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/4946fema.len b/data/moby/share/ilash/common/Packages/Moby/mwords/4946fema.len
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/4946fema.len
rename to data/moby/share/ilash/common/Packages/Moby/mwords/4946fema.len
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/6213acro.nym b/data/moby/share/ilash/common/Packages/Moby/mwords/6213acro.nym
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/6213acro.nym
rename to data/moby/share/ilash/common/Packages/Moby/mwords/6213acro.nym
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/74550com.mon b/data/moby/share/ilash/common/Packages/Moby/mwords/74550com.mon
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/74550com.mon
rename to data/moby/share/ilash/common/Packages/Moby/mwords/74550com.mon
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/readme.txt b/data/moby/share/ilash/common/Packages/Moby/mwords/readme.txt
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/readme.txt
rename to data/moby/share/ilash/common/Packages/Moby/mwords/readme.txt
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/usaconst.itu b/data/moby/share/ilash/common/Packages/Moby/mwords/usaconst.itu
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/mwords/usaconst.itu
rename to data/moby/share/ilash/common/Packages/Moby/mwords/usaconst.itu
diff --git a/data/wordlists/moby/share/ilash/common/Packages/Moby/readme b/data/moby/share/ilash/common/Packages/Moby/readme
similarity index 100%
rename from data/wordlists/moby/share/ilash/common/Packages/Moby/readme
rename to data/moby/share/ilash/common/Packages/Moby/readme