4 files changed, 5 insertions, 26 deletions

diff --git a/src/bot/advanced.lisp b/src/bot/advanced.lisp
index 635bdb0..c18b574 100644
--- a/src/bot/advanced.lisp
+++ b/src/bot/advanced.lisp
@@ -1,7 +1,8 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/advanced
-  (:use :c2cl :ukkoclot/bot/impl :ukkoclot/bot/methods :ukkoclot/tg)
+  (:use :c2cl :ukkoclot/bot/methods :ukkoclot/tg)
+  (:import-from :ukkoclot/state :bot-id% :bot-username%)
   (:export :bot-id :bot-username :reply-animation :reply-message :try-delete-message))
 (in-package :ukkoclot/bot/advanced)
 
diff --git a/src/bot/impl.lisp b/src/bot/impl.lisp
deleted file mode 100644
index ea1aa03..0000000
--- a/src/bot/impl.lisp
+++ /dev/null
@@ -1,23 +0,0 @@
-;; SPDX-License-Identifier: EUPL-1.2
-;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/bot/impl
-  (:use :c2cl :iterate :ukkoclot/config)
-  (:export
-   :bot :bot-p :make-bot
-
-   :bot-config :bot-db :bot-base-uri :bot-power-on :bot-username% :bot-id%))
-(in-package :ukkoclot/bot/impl)
-
-(defstruct (bot (:constructor make-bot%))
-  (config (error "No value given for config") :read-only t)
-  (db (error "No value given for DB") :read-only t)
-  (base-uri (error "No value given for base-uri") :read-only t)
-  (power-on t :type boolean)
-  (username% nil :type (or string null))
-  (id% nil :type (or integer null)))
-
-(defun make-bot (config db)
-  (let ((base-uri (concatenate 'string
-                               "https://api.telegram.org/bot"
-                               (config-bot-token config) "/")))
-    (make-bot% :config config :db db :base-uri base-uri)))
diff --git a/src/bot/method-macros.lisp b/src/bot/method-macros.lisp
index b6f237f..0500de9 100644
--- a/src/bot/method-macros.lisp
+++ b/src/bot/method-macros.lisp
@@ -2,7 +2,7 @@
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/method-macros
   (:use :c2cl :iterate)
-  (:import-from :ukkoclot/bot/impl :bot)
+  (:import-from :ukkoclot/state :bot)
   (:import-from :ukkoclot/transport :do-call)
   (:export :define-tg-method))
 (in-package :ukkoclot/bot/method-macros)
diff --git a/src/bot/methods.lisp b/src/bot/methods.lisp
index bddb9ff..2daea6f 100644
--- a/src/bot/methods.lisp
+++ b/src/bot/methods.lisp
@@ -1,7 +1,8 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/methods
-  (:use :c2cl :ukkoclot/bot/method-macros :ukkoclot/bot/impl :ukkoclot/tg)
+  (:use :c2cl :ukkoclot/bot/method-macros :ukkoclot/tg)
+  (:import-from :ukkoclot/state :bot-id% :bot-username%)
   (:export :answer-callback-query :delete-message :send-animation :edit-message-text :get-me :get-updates :send-message :set-my-name))
 (in-package :ukkoclot/bot/methods)