Moves imports in package

package/src/directories/mod.rs

@@ -1,5 +1,2 @@
-pub mod imports;
-pub use self::imports::*;
-
 pub mod source;
 pub use self::source::*;

package/src/errors/directory/mod.rs

@@ -1,5 +1,2 @@
-pub mod imports;
-pub use self::imports::*;
-
 pub mod source;
 pub use self::source::*;

package/src/errors/imports/mod.rs

@@ -0,0 +1,2 @@
+pub mod directory;
+pub use directory::*;

package/src/errors/mod.rs

@@ -4,6 +4,9 @@ pub use self::directory::*;
 pub mod files;
 pub use self::files::*;
 
+pub mod imports;
+pub use imports::*;
+
 pub mod inputs;
 pub use inputs::*;
 

package/src/files/zip.rs

@@ -1,8 +1,8 @@
 //! The program package zip file.
 
 use crate::{
-    directories::IMPORTS_DIRECTORY_NAME,
     errors::ZipFileError,
+    imports::IMPORTS_DIRECTORY_NAME,
     inputs::{INPUT_DIRECTORY_NAME, INPUT_FILE_EXTENSION},
     outputs::{
         CHECKSUM_FILE_EXTENSION,

package/src/imports/mod.rs

@@ -0,0 +1,2 @@
+pub mod directory;
+pub use directory::*;

package/src/inputs/directory.rs

@@ -1,10 +1,8 @@
-use crate::errors::InputDirectoryError;
+use crate::{errors::InputDirectoryError, inputs::INPUT_FILE_EXTENSION};
 
 use std::{fs, path::PathBuf};
 
-pub static INPUT_DIRECTORY_NAME: &str = "input/";
-
-static INPUT_FILE_EXTENSION: &str = "leo.in";
+pub static INPUT_DIRECTORY_NAME: &str = "inputs/";
 
 pub struct InputDirectory;
 

package/src/lib.rs

@@ -6,5 +6,6 @@ pub use errors::*;
 
 pub mod directories;
 pub mod files;
+pub mod imports;
 pub mod inputs;
 pub mod outputs;

package/src/outputs/directory.rs

@@ -2,7 +2,7 @@ use crate::errors::OutputDirectoryError;
 
 use std::{fs, path::PathBuf};
 
-pub static OUTPUT_DIRECTORY_NAME: &str = "output/";
+pub static OUTPUT_DIRECTORY_NAME: &str = "outputs/";
 
 pub struct OutputDirectory;