diff --git a/safekeeper/src/lib.rs b/safekeeper/src/lib.rs
index 32c16684b0..757b1dc851 100644
--- a/safekeeper/src/lib.rs
+++ b/safekeeper/src/lib.rs
@@ -19,7 +19,9 @@ pub mod receive_wal;
 pub mod remove_wal;
 pub mod safekeeper;
 pub mod send_wal;
-pub mod sim;
+pub mod simlib;
+#[cfg(test)]
+pub mod simtest;
 pub mod timeline;
 pub mod wal_backup;
 pub mod wal_service;
diff --git a/safekeeper/src/sim/chan.rs b/safekeeper/src/simlib/chan.rs
similarity index 100%
rename from safekeeper/src/sim/chan.rs
rename to safekeeper/src/simlib/chan.rs
diff --git a/safekeeper/src/sim/mod.rs b/safekeeper/src/simlib/mod.rs
similarity index 60%
rename from safekeeper/src/sim/mod.rs
rename to safekeeper/src/simlib/mod.rs
index 6e4b4ac171..eae85cc366 100644
--- a/safekeeper/src/sim/mod.rs
+++ b/safekeeper/src/simlib/mod.rs
@@ -1,11 +1,6 @@
 pub mod chan;
-pub mod client;
-pub mod disk;
-pub mod disklog;
 pub mod node_os;
 pub mod proto;
-#[cfg(test)]
-pub mod start_test;
 pub mod sync;
 pub mod tcp;
 pub mod time;
diff --git a/safekeeper/src/sim/node_os.rs b/safekeeper/src/simlib/node_os.rs
similarity index 100%
rename from safekeeper/src/sim/node_os.rs
rename to safekeeper/src/simlib/node_os.rs
diff --git a/safekeeper/src/sim/proto.rs b/safekeeper/src/simlib/proto.rs
similarity index 100%
rename from safekeeper/src/sim/proto.rs
rename to safekeeper/src/simlib/proto.rs
diff --git a/safekeeper/src/sim/sync.rs b/safekeeper/src/simlib/sync.rs
similarity index 100%
rename from safekeeper/src/sim/sync.rs
rename to safekeeper/src/simlib/sync.rs
diff --git a/safekeeper/src/sim/tcp.rs b/safekeeper/src/simlib/tcp.rs
similarity index 100%
rename from safekeeper/src/sim/tcp.rs
rename to safekeeper/src/simlib/tcp.rs
diff --git a/safekeeper/src/sim/time.rs b/safekeeper/src/simlib/time.rs
similarity index 100%
rename from safekeeper/src/sim/time.rs
rename to safekeeper/src/simlib/time.rs
diff --git a/safekeeper/src/sim/wait_group.rs b/safekeeper/src/simlib/wait_group.rs
similarity index 100%
rename from safekeeper/src/sim/wait_group.rs
rename to safekeeper/src/simlib/wait_group.rs
diff --git a/safekeeper/src/sim/world.rs b/safekeeper/src/simlib/world.rs
similarity index 100%
rename from safekeeper/src/sim/world.rs
rename to safekeeper/src/simlib/world.rs
diff --git a/safekeeper/src/sim/client.rs b/safekeeper/src/simtest/client.rs
similarity index 82%
rename from safekeeper/src/sim/client.rs
rename to safekeeper/src/simtest/client.rs
index 3212b79408..4a647cc96d 100644
--- a/safekeeper/src/sim/client.rs
+++ b/safekeeper/src/simtest/client.rs
@@ -1,8 +1,4 @@
-use super::{
-    node_os::NodeOs,
-    proto::{AnyMessage, ReplCell},
-    world::NodeId,
-};
+use crate::simlib::{node_os::NodeOs, proto::{ReplCell, AnyMessage}, world::NodeId};
 
 /// Copy all data from array to the remote node.
 pub fn run_client(os: NodeOs, data: &[ReplCell], dst: NodeId) {
diff --git a/safekeeper/src/sim/disk.rs b/safekeeper/src/simtest/disk.rs
similarity index 96%
rename from safekeeper/src/sim/disk.rs
rename to safekeeper/src/simtest/disk.rs
index 61a81564f6..500e1a75e6 100644
--- a/safekeeper/src/sim/disk.rs
+++ b/safekeeper/src/simtest/disk.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use anyhow::Result;
 
-use super::sync::{Mutex, Park};
+use crate::simlib::sync::{Mutex, Park};
 
 pub trait Storage<T> {
     fn flush_pos(&self) -> u32;
diff --git a/safekeeper/src/sim/start_test.rs b/safekeeper/src/simtest/mod.rs
similarity index 89%
rename from safekeeper/src/sim/start_test.rs
rename to safekeeper/src/simtest/mod.rs
index cd22e9739c..e6ca7ec6b2 100644
--- a/safekeeper/src/sim/start_test.rs
+++ b/safekeeper/src/simtest/mod.rs
@@ -1,8 +1,10 @@
+mod client;
+mod disk;
+mod server;
+
 use std::{sync::Arc};
 
-use super::{
-    client::run_client, disk::SharedStorage, disklog::run_server, proto::ReplCell, world::World,
-};
+use crate::{simlib::{world::World, proto::ReplCell}, simtest::{client::run_client, disk::SharedStorage, server::run_server}};
 
 #[test]
 fn start_simulation() {
diff --git a/safekeeper/src/sim/disklog.rs b/safekeeper/src/simtest/server.rs
similarity index 89%
rename from safekeeper/src/sim/disklog.rs
rename to safekeeper/src/simtest/server.rs
index 0b97f0d481..4111a90a01 100644
--- a/safekeeper/src/sim/disklog.rs
+++ b/safekeeper/src/simtest/server.rs
@@ -1,6 +1,8 @@
 use std::collections::HashMap;
 
-use super::{disk::Storage, node_os::NodeOs, proto::AnyMessage, world::NodeEvent};
+use crate::simlib::{node_os::NodeOs, world::NodeEvent, proto::AnyMessage};
+
+use super::disk::Storage;
 
 pub struct DiskLog {
     pub map: HashMap<String, u32>,