reorganize

src/dictionary.rs

@@ -10,6 +10,14 @@ use std::path::{Path, PathBuf};
 
 pub type VoiceName = String;
 
+#[derive(RustcDecodable, RustcEncodable)]
+pub struct VocabularyLibrary {
+  /**
+   * A map of several vocabularies with their associated speaker.
+   */
+  pub library: HashMap<VoiceName, Vocabulary>
+}
+
 #[derive(RustcDecodable, RustcEncodable)]
 pub struct Vocabulary {
   /**
@@ -19,14 +27,6 @@ pub struct Vocabulary {
   pub words: Vec<String>
 }
 
-#[derive(RustcDecodable, RustcEncodable)]
-pub struct VocabularyLibrary {
-  /**
-   * A map of several vocabularies with their associated speaker.
-   */
-  pub library: HashMap<VoiceName, Vocabulary>
-}
-
 impl VocabularyLibrary {
   /** Read all of the vocabularies under a directory. */
   pub fn read_from_directory(directory: &Path) ->