diff --git a/pl/cross/messaging/kafka/tools/confluent.txt b/pl/cross/messaging/kafka/confluent.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/confluent.txt
rename to pl/cross/messaging/kafka/confluent.txt
diff --git a/pl/cross/messaging/kafka/docs/resources.txt b/pl/cross/messaging/kafka/docs/resources.txt
index a552efa02..d9242cb10 100644
--- a/pl/cross/messaging/kafka/docs/resources.txt
+++ b/pl/cross/messaging/kafka/docs/resources.txt
@@ -1 +1,2 @@
 https://t.me/proKafka
+https://softwaremill.com/kafka-visualisation/
diff --git a/pl/cross/messaging/kafka/tools/confluent-kafka-streams.txt b/pl/cross/messaging/kafka/features/stream/confluent-kafka-streams.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/confluent-kafka-streams.txt
rename to pl/cross/messaging/kafka/features/stream/confluent-kafka-streams.txt
diff --git a/pl/cross/messaging/kafka/tools/admin-tools.txt b/pl/cross/messaging/kafka/tools/client/cli/admin-tools.txt
similarity index 94%
rename from pl/cross/messaging/kafka/tools/admin-tools.txt
rename to pl/cross/messaging/kafka/tools/client/cli/admin-tools.txt
index bbd2a79a8..ffc4dd952 100644
--- a/pl/cross/messaging/kafka/tools/admin-tools.txt
+++ b/pl/cross/messaging/kafka/tools/client/cli/admin-tools.txt
@@ -1,6 +1,11 @@
+2022
+https://medium.com/@TimvanBaarsen/apache-kafka-cli-commands-cheat-sheet-a6f06eac01b
+
 ? KafkaManager
+https://github.com/yahoo/CMAK
 
 kafka-topic.sh
+    https://habr.com/ru/companies/slurm/articles/719540/
     most topic operations
 kafka-config.sh
     config changes
diff --git a/pl/cross/messaging/kafka/tools/client/confluent-cli.txt b/pl/cross/messaging/kafka/tools/client/cli/confluent-cli.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/client/confluent-cli.txt
rename to pl/cross/messaging/kafka/tools/client/cli/confluent-cli.txt
diff --git a/pl/cross/messaging/kafka/tools/client/cli/go/kaf.txt b/pl/cross/messaging/kafka/tools/client/cli/go/kaf.txt
new file mode 100644
index 000000000..cc517bb47
--- /dev/null
+++ b/pl/cross/messaging/kafka/tools/client/cli/go/kaf.txt
@@ -0,0 +1,3 @@
+https://github.com/birdayz/kaf
+https://github.com/birdayz/kaf/blob/master/examples/sasl_ssl_custom_ca.yaml
+https://github.com/birdayz/kaf/blob/master/examples/sasl_ssl_scram.yaml
diff --git a/pl/cross/messaging/kafka/tools/client/go/kafkactl.txt b/pl/cross/messaging/kafka/tools/client/cli/go/kafkactl.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/client/go/kafkactl.txt
rename to pl/cross/messaging/kafka/tools/client/cli/go/kafkactl.txt
diff --git a/pl/cross/messaging/kafka/tools/client/go/sarama.txt b/pl/cross/messaging/kafka/tools/client/cli/go/sarama.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/client/go/sarama.txt
rename to pl/cross/messaging/kafka/tools/client/cli/go/sarama.txt
diff --git a/pl/cross/messaging/kafka/tools/client/kcat.txt b/pl/cross/messaging/kafka/tools/client/cli/kcat.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/client/kcat.txt
rename to pl/cross/messaging/kafka/tools/client/cli/kcat.txt
diff --git a/pl/cross/messaging/kafka/tools/client/conduktor.txt b/pl/cross/messaging/kafka/tools/client/conduktor.txt
deleted file mode 100644
index bbf95be78..000000000
--- a/pl/cross/messaging/kafka/tools/client/conduktor.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://www.conduktor.io/
diff --git a/pl/cross/messaging/kafka/tools/client/gui/epam-kafka-manager.txt b/pl/cross/messaging/kafka/tools/client/gui/epam-kafka-manager.txt
new file mode 100644
index 000000000..799cef869
--- /dev/null
+++ b/pl/cross/messaging/kafka/tools/client/gui/epam-kafka-manager.txt
@@ -0,0 +1,2 @@
+https://github.com/epam/eco-kafka-manager
+https://mvnrepository.com/artifact/com.epam.eco.kafkamanager/kafka-manager-parent
diff --git a/pl/cross/messaging/kafka/tools/offset-explorer.txt b/pl/cross/messaging/kafka/tools/client/gui/offset-explorer.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/offset-explorer.txt
rename to pl/cross/messaging/kafka/tools/client/gui/offset-explorer.txt
diff --git a/pl/cross/messaging/kafka/tools/client/gui/old/cmak.txt b/pl/cross/messaging/kafka/tools/client/gui/old/cmak.txt
new file mode 100644
index 000000000..b43a25233
--- /dev/null
+++ b/pl/cross/messaging/kafka/tools/client/gui/old/cmak.txt
@@ -0,0 +1,2 @@
+KafkaManager
+https://github.com/yahoo/CMAK
diff --git a/pl/cross/messaging/kafka/tools/client/kaf.txt b/pl/cross/messaging/kafka/tools/client/kaf.txt
deleted file mode 100644
index 958d92553..000000000
--- a/pl/cross/messaging/kafka/tools/client/kaf.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/birdayz/kaf
diff --git a/pl/cross/messaging/kafka/tools/client/kafka-webview.txt b/pl/cross/messaging/kafka/tools/client/kafka-webview.txt
deleted file mode 100644
index 5f8307faf..000000000
--- a/pl/cross/messaging/kafka/tools/client/kafka-webview.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/SourceLabOrg/kafka-webview
diff --git a/pl/cross/messaging/kafka/tools/client/kafkacat.txt b/pl/cross/messaging/kafka/tools/client/kafkacat.txt
deleted file mode 100644
index 5fa4960ba..000000000
--- a/pl/cross/messaging/kafka/tools/client/kafkacat.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/edenhill/kafkacat
diff --git a/pl/cross/messaging/kafka/tools/client/tui/kaskade.txt b/pl/cross/messaging/kafka/tools/client/tui/kaskade.txt
new file mode 100644
index 000000000..fbd0d1a0c
--- /dev/null
+++ b/pl/cross/messaging/kafka/tools/client/tui/kaskade.txt
@@ -0,0 +1,10 @@
+https://github.com/sauljabin/kaskade
+https://github.com/sauljabin/kaskade/blob/main/kaskade/main.py
+
+docker run --rm -it sauljabin/kaskade:latest
+
+kaskade admin -b ${BOOTSTRAP_SERVERS} \
+        -c security.protocol=SASL_SSL \
+        -c sasl.mechanism=PLAIN \
+        -c sasl.username=${CLUSTER_API_KEY} \
+        -c sasl.password=${CLUSTER_API_SECRET}
diff --git a/pl/cross/messaging/kafka/tools/kafkaer.txt b/pl/cross/messaging/kafka/tools/deploy/old/kafkaer.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/kafkaer.txt
rename to pl/cross/messaging/kafka/tools/deploy/old/kafkaer.txt
diff --git a/pl/cross/messaging/kafka/tools/zoe.txt b/pl/cross/messaging/kafka/tools/produce-consume/zoe.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/zoe.txt
rename to pl/cross/messaging/kafka/tools/produce-consume/zoe.txt
diff --git a/pl/cross/messaging/kafka/tools/ksunami.txt b/pl/cross/messaging/kafka/tools/testing/ksunami.txt
similarity index 100%
rename from pl/cross/messaging/kafka/tools/ksunami.txt
rename to pl/cross/messaging/kafka/tools/testing/ksunami.txt
diff --git a/pl/cross/messaging/kafka/tools/uber-replicator.txt b/pl/cross/messaging/kafka/tools/uber-replicator.txt
deleted file mode 100644
index 278dab51a..000000000
--- a/pl/cross/messaging/kafka/tools/uber-replicator.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://eng.uber.com/ureplicator/
diff --git a/pl/cross/messaging/kafka/tools/vis/articles.txt b/pl/cross/messaging/kafka/tools/vis/articles.txt
deleted file mode 100644
index 2f5a8622e..000000000
--- a/pl/cross/messaging/kafka/tools/vis/articles.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2022
-https://www.47deg.com/blog/tools-and-tips-for-visualizing-kafka-messages/
diff --git a/pl/cross/messaging/kafka/tools/vis/kafka-visualisation.txt b/pl/cross/messaging/kafka/tools/vis/kafka-visualisation.txt
deleted file mode 100644
index 34658793a..000000000
--- a/pl/cross/messaging/kafka/tools/vis/kafka-visualisation.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://softwaremill.com/kafka-visualisation/