diff --git a/server/src/kvengine/dbsize.rs b/server/src/actions/dbsize.rs
similarity index 100%
rename from server/src/kvengine/dbsize.rs
rename to server/src/actions/dbsize.rs
diff --git a/server/src/kvengine/del.rs b/server/src/actions/del.rs
similarity index 100%
rename from server/src/kvengine/del.rs
rename to server/src/actions/del.rs
diff --git a/server/src/kvengine/exists.rs b/server/src/actions/exists.rs
similarity index 100%
rename from server/src/kvengine/exists.rs
rename to server/src/actions/exists.rs
diff --git a/server/src/kvengine/flushdb.rs b/server/src/actions/flushdb.rs
similarity index 100%
rename from server/src/kvengine/flushdb.rs
rename to server/src/actions/flushdb.rs
diff --git a/server/src/kvengine/get.rs b/server/src/actions/get.rs
similarity index 100%
rename from server/src/kvengine/get.rs
rename to server/src/actions/get.rs
diff --git a/server/src/kvengine/jget.rs b/server/src/actions/jget.rs
similarity index 100%
rename from server/src/kvengine/jget.rs
rename to server/src/actions/jget.rs
diff --git a/server/src/kvengine/keylen.rs b/server/src/actions/keylen.rs
similarity index 100%
rename from server/src/kvengine/keylen.rs
rename to server/src/actions/keylen.rs
diff --git a/server/src/kvengine/lskeys.rs b/server/src/actions/lskeys.rs
similarity index 100%
rename from server/src/kvengine/lskeys.rs
rename to server/src/actions/lskeys.rs
diff --git a/server/src/kvengine/mget.rs b/server/src/actions/mget.rs
similarity index 100%
rename from server/src/kvengine/mget.rs
rename to server/src/actions/mget.rs
diff --git a/server/src/kvengine/mod.rs b/server/src/actions/mod.rs
similarity index 100%
rename from server/src/kvengine/mod.rs
rename to server/src/actions/mod.rs
diff --git a/server/src/kvengine/mset.rs b/server/src/actions/mset.rs
similarity index 100%
rename from server/src/kvengine/mset.rs
rename to server/src/actions/mset.rs
diff --git a/server/src/kvengine/mupdate.rs b/server/src/actions/mupdate.rs
similarity index 100%
rename from server/src/kvengine/mupdate.rs
rename to server/src/actions/mupdate.rs
diff --git a/server/src/kvengine/set.rs b/server/src/actions/set.rs
similarity index 100%
rename from server/src/kvengine/set.rs
rename to server/src/actions/set.rs
diff --git a/server/src/kvengine/strong.rs b/server/src/actions/strong.rs
similarity index 100%
rename from server/src/kvengine/strong.rs
rename to server/src/actions/strong.rs
diff --git a/server/src/kvengine/update.rs b/server/src/actions/update.rs
similarity index 100%
rename from server/src/kvengine/update.rs
rename to server/src/actions/update.rs
diff --git a/server/src/kvengine/uset.rs b/server/src/actions/uset.rs
similarity index 100%
rename from server/src/kvengine/uset.rs
rename to server/src/actions/uset.rs
diff --git a/server/src/main.rs b/server/src/main.rs
index 5fb8c9cd..f1bdce77 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -36,11 +36,11 @@ use crate::config::SnapshotConfig;
 use std::io::{self, prelude::*};
 mod config;
 use std::env;
+mod actions;
 mod admin;
 mod coredb;
 mod dbnet;
 mod diskstore;
-mod kvengine;
 mod protocol;
 mod queryengine;
 mod resp;
diff --git a/server/src/queryengine/mod.rs b/server/src/queryengine/mod.rs
index da00087d..c92e733a 100644
--- a/server/src/queryengine/mod.rs
+++ b/server/src/queryengine/mod.rs
@@ -31,7 +31,7 @@ use crate::dbnet::connection::prelude::*;
 use crate::gen_match;
 use crate::protocol::responses;
 use crate::protocol::Element;
-use crate::{admin, kvengine};
+use crate::{actions, admin};
 
 mod tags {
     //! This module is a collection of tags/strings used for evaluating queries
@@ -89,24 +89,24 @@ where
         db,
         con,
         buf,
-        tags::TAG_DEL => kvengine::del::del,
-        tags::TAG_GET => kvengine::get::get,
-        tags::TAG_HEYA => kvengine::heya::heya,
-        tags::TAG_EXISTS => kvengine::exists::exists,
-        tags::TAG_SET => kvengine::set::set,
-        tags::TAG_MGET => kvengine::mget::mget,
-        tags::TAG_MSET => kvengine::mset::mset,
-        tags::TAG_UPDATE => kvengine::update::update,
-        tags::TAG_MUPDATE => kvengine::mupdate::mupdate,
-        tags::TAG_SSET => kvengine::strong::sset,
-        tags::TAG_SDEL => kvengine::strong::sdel,
-        tags::TAG_SUPDATE => kvengine::strong::supdate,
-        tags::TAG_DBSIZE => kvengine::dbsize::dbsize,
-        tags::TAG_FLUSHDB => kvengine::flushdb::flushdb,
-        tags::TAG_USET => kvengine::uset::uset,
-        tags::TAG_KEYLEN => kvengine::keylen::keylen,
+        tags::TAG_DEL => actions::del::del,
+        tags::TAG_GET => actions::get::get,
+        tags::TAG_HEYA => actions::heya::heya,
+        tags::TAG_EXISTS => actions::exists::exists,
+        tags::TAG_SET => actions::set::set,
+        tags::TAG_MGET => actions::mget::mget,
+        tags::TAG_MSET => actions::mset::mset,
+        tags::TAG_UPDATE => actions::update::update,
+        tags::TAG_MUPDATE => actions::mupdate::mupdate,
+        tags::TAG_SSET => actions::strong::sset,
+        tags::TAG_SDEL => actions::strong::sdel,
+        tags::TAG_SUPDATE => actions::strong::supdate,
+        tags::TAG_DBSIZE => actions::dbsize::dbsize,
+        tags::TAG_FLUSHDB => actions::flushdb::flushdb,
+        tags::TAG_USET => actions::uset::uset,
+        tags::TAG_KEYLEN => actions::keylen::keylen,
         tags::TAG_MKSNAP => admin::mksnap::mksnap,
-        tags::TAG_LSKEYS => kvengine::lskeys::lskeys
+        tags::TAG_LSKEYS => actions::lskeys::lskeys
     );
     Ok(())
 }