diff --git a/src/meta_plugin/digest.rs b/src/meta_plugin/digest.rs
index 6759486..92aa354 100644
--- a/src/meta_plugin/digest.rs
+++ b/src/meta_plugin/digest.rs
@@ -1,5 +1,4 @@
 use sha2::{Digest, Sha256};
-use std::time::Instant;
 
 use crate::meta_plugin::MetaPlugin;
 
diff --git a/src/meta_plugin/mod.rs b/src/meta_plugin/mod.rs
index 333a6cb..a970951 100644
--- a/src/meta_plugin/mod.rs
+++ b/src/meta_plugin/mod.rs
@@ -3,13 +3,14 @@ use serde::{Deserialize, Serialize};
 
 pub mod program;
 pub mod digest;
-pub mod system;
 pub mod magic;
 pub mod binary;
 pub mod text;
 pub mod read_time;
 pub mod read_rate;
 pub mod hostname;
+pub mod cwd;
+pub mod user;
 
 use crate::meta_plugin::program::MetaPluginProgram;
 use crate::meta_plugin::digest::DigestSha256MetaPlugin;
@@ -18,12 +19,9 @@ use crate::meta_plugin::read_rate::ReadRateMetaPlugin;
 use crate::meta_plugin::magic::MagicFileMetaPlugin;
 use crate::meta_plugin::binary::BinaryMetaPlugin;
 use crate::meta_plugin::text::TextMetaPlugin;
-use crate::meta_plugin::system::CwdMetaPlugin;
-use crate::meta_plugin::system::UserMetaPlugin;
-use crate::meta_plugin::system::ShellMetaPlugin;
-use crate::meta_plugin::system::ShellPidMetaPlugin;
-use crate::meta_plugin::system::KeepPidMetaPlugin;
 use crate::meta_plugin::hostname::HostnameMetaPlugin;
+use crate::meta_plugin::cwd::CwdMetaPlugin;
+use crate::meta_plugin::user::UserMetaPlugin;
 
 /// Represents metadata to be stored
 #[derive(Debug, Clone, Serialize, Deserialize)]