diff --git a/Cargo.toml b/Cargo.toml
index 92781aa..17fa539 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,8 @@ members = [
 	"network/abstract",
 	"network/windows",
 	"gui/abstract",
-	"gui/egui"
+	"gui/egui",
+	"data"
 ]
 
 [workspace.lints]
diff --git a/app/src/data/mod.rs b/app/src/data/mod.rs
deleted file mode 100644
index 5111c9f..0000000
--- a/app/src/data/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod cycle_buffer;
-mod server;
diff --git a/app/src/data/server.rs b/app/src/data/server.rs
deleted file mode 100644
index cda7041..0000000
--- a/app/src/data/server.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use crate::io::Address;
-use crate::data::cycle_buffer::CycledBuffer;
-
-pub struct Server {
-    address: Address,
-    history: CycledBuffer<u16>,
-    label: String,
-}
diff --git a/data/Cargo.toml b/data/Cargo.toml
new file mode 100644
index 0000000..dfea9a8
--- /dev/null
+++ b/data/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "bgtu-networks-2-data"
+version = "0.0.0"
+edition = "2024"
+
+[lints]
+workspace = true
+
+[dependencies]
+bgtu-networks-2-network-abstract = { path = "../network/abstract" }
+bgtu-networks-2-gui-abstract = { path = "../gui/abstract" }
diff --git a/app/src/data/cycle_buffer.rs b/data/src/cycle_buffer.rs
similarity index 99%
rename from app/src/data/cycle_buffer.rs
rename to data/src/cycle_buffer.rs
index 6511d64..0d63a1d 100644
--- a/app/src/data/cycle_buffer.rs
+++ b/data/src/cycle_buffer.rs
@@ -183,7 +183,7 @@ impl<C: Len, E, G: Fn(&mut C, usize) -> E> Iterator for CycledIterator<C, E, G>
 
 #[cfg(test)]
 mod _tests {
-    use crate::data::cycle_buffer::CycledBuffer;
+    use super::CycledBuffer;
 
     #[test]
     fn test1() {
diff --git a/data/src/lib.rs b/data/src/lib.rs
new file mode 100644
index 0000000..925ddb4
--- /dev/null
+++ b/data/src/lib.rs
@@ -0,0 +1,10 @@
+mod cycle_buffer;
+
+use std::collections::HashSet;
+use bgtu_networks_2_gui_abstract::ServersStorage as ServersGuiCtx;
+use bgtu_networks_2_network_abstract::{Address, ServersContext as ServersNetworkCtx};
+use crate::cycle_buffer::CycledBuffer;
+
+struct ServersStorage<A: Address> {
+    map: HashSet<A, (String, CycledBuffer<Option<u32>>)>
+}