45 files changed, 185 insertions, 185 deletions
diff --git a/src/tg/animation.lisp b/src/tg/animation.lisp
index cae4933..3c95c1a 100644
--- a/src/tg/animation.lisp
+++ b/src/tg/animation.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/animation
+(defpackage :ukkoclot/src/tg/animation
-  (:use :c2cl :ukkoclot/tg/type-macros :ukkoclot/tg/photo-size)
+  (:use :c2cl :ukkoclot/src/tg/type-macros :ukkoclot/src/tg/photo-size)
  (:export
   #:animation
   #:make-animation
@@ -16,7 +16,7 @@
   #:animation-file-name
   #:animation-mime-type
   #:animation-file-size))
-(in-package :ukkoclot/tg/animation)
+(in-package :ukkoclot/src/tg/animation)
 (define-tg-type animation
  (file-id string)
diff --git a/src/tg/answer-callback-query.lisp b/src/tg/answer-callback-query.lisp
index c7ecb5f..0bf958f 100644
--- a/src/tg/answer-callback-query.lisp
+++ b/src/tg/answer-callback-query.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/answer-callback-query
+(defpackage :ukkoclot/src/tg/answer-callback-query
-  (:use :c2cl :ukkoclot/tg/method-macros)
+  (:use :c2cl :ukkoclot/src/tg/method-macros)
  (:export :answer-callback-query))
-(in-package :ukkoclot/tg/answer-callback-query)
+(in-package :ukkoclot/src/tg/answer-callback-query)
 (define-tg-method (answer-callback-query boolean)
  (callback-query-id string)
diff --git a/src/tg/bot-name.lisp b/src/tg/bot-name.lisp
index 10e873c..3205b50 100644
--- a/src/tg/bot-name.lisp
+++ b/src/tg/bot-name.lisp
@@ -1,14 +1,14 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/bot-name
+(defpackage :ukkoclot/src/tg/bot-name
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:bot-name
   #:make-bot-name
   #:bot-name-p
   #:copy-bot-name
   #:bot-name-name))
-(in-package :ukkoclot/tg/bot-name)
+(in-package :ukkoclot/src/tg/bot-name)
 (define-tg-type bot-name
  (name string))
diff --git a/src/tg/business-bot-rights.lisp b/src/tg/business-bot-rights.lisp
index 8d852d2..d683451 100644
--- a/src/tg/business-bot-rights.lisp
+++ b/src/tg/business-bot-rights.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/business-bot-rights
+(defpackage :ukkoclot/src/tg/business-bot-rights
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:business-bot-rights
   #:make-business-bot-rights
@@ -21,7 +21,7 @@
   #:business-bot-rights-can-transfer-and-upgrade-gifts
   #:business-bot-rights-can-transfer-stars
   #:business-bot-rights-can-manage-stories))
-(in-package :ukkoclot/tg/business-bot-rights)
+(in-package :ukkoclot/src/tg/business-bot-rights)
 (define-tg-type business-bot-rights
  (can-reply boolean nil)
diff --git a/src/tg/business-connection.lisp b/src/tg/business-connection.lisp
index 726cdd4..ee2eb15 100644
--- a/src/tg/business-connection.lisp
+++ b/src/tg/business-connection.lisp
@@ -1,11 +1,11 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/business-connection
+(defpackage :ukkoclot/src/tg/business-connection
  (:use
   :c2cl
-   :ukkoclot/tg/type-macros
+   :ukkoclot/src/tg/type-macros
-   :ukkoclot/tg/business-bot-rights
+   :ukkoclot/src/tg/business-bot-rights
-   :ukkoclot/tg/user)
+   :ukkoclot/src/tg/user)
  (:export
   #:business-connection
   #:make-business-connection
@@ -17,7 +17,7 @@
   #:business-connection-date
   #:business-connection-rights
   #:business-connection-is-enabled))
-(in-package :ukkoclot/tg/business-connection)
+(in-package :ukkoclot/src/tg/business-connection)
 (define-tg-type business-connection
  (id string)
diff --git a/src/tg/callback-query.lisp b/src/tg/callback-query.lisp
index 3f8cf2d..8dc88d1 100644
--- a/src/tg/callback-query.lisp
+++ b/src/tg/callback-query.lisp
@@ -1,10 +1,10 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/callback-query
+(defpackage :ukkoclot/src/tg/callback-query
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:use
-   :ukkoclot/tg/message
+   :ukkoclot/src/tg/message
-   :ukkoclot/tg/user)
+   :ukkoclot/src/tg/user)
  (:export
   #:callback-query
   #:make-callback-query
@@ -17,7 +17,7 @@
   #:callback-query-chat-instance
   #:callback-query-data
   #:callback-query-game-short-name))
-(in-package :ukkoclot/tg/callback-query)
+(in-package :ukkoclot/src/tg/callback-query)
 (define-tg-type callback-query
  (id string)
diff --git a/src/tg/chat-administrator-rights.lisp b/src/tg/chat-administrator-rights.lisp
index 4cbe47f..05f5fb7 100644
--- a/src/tg/chat-administrator-rights.lisp
+++ b/src/tg/chat-administrator-rights.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/chat-administrator-rights
+(defpackage :ukkoclot/src/tg/chat-administrator-rights
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:chat-administrator-rights
   #:make-chat-administrator-rights
@@ -23,7 +23,7 @@
   #:chat-administrator-rights-can-pin-messages
   #:chat-administrator-rights-can-manage-topics
   #:chat-administrator-rights-can-manage-direct-messages))
-(in-package :ukkoclot/tg/chat-administrator-rights)
+(in-package :ukkoclot/src/tg/chat-administrator-rights)
 (define-tg-type chat-administrator-rights
  (is-anonymous boolean)
diff --git a/src/tg/chat-type.lisp b/src/tg/chat-type.lisp
index daf135a..4d19bd1 100644
--- a/src/tg/chat-type.lisp
+++ b/src/tg/chat-type.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/chat-type
+(defpackage :ukkoclot/src/tg/chat-type
-  (:use :c2cl :ukkoclot/enum)
+  (:use :c2cl :ukkoclot/src/enum)
  (:export :channel :chat-type :group :private :supergroup))
-(in-package :ukkoclot/tg/chat-type)
+(in-package :ukkoclot/src/tg/chat-type)
 (define-enum chat-type
  (private "private")
diff --git a/src/tg/chat.lisp b/src/tg/chat.lisp
index bdb698a..6e2f2b7 100644
--- a/src/tg/chat.lisp
+++ b/src/tg/chat.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/chat
+(defpackage :ukkoclot/src/tg/chat
-  (:use :c2cl :ukkoclot/tg/chat-type :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/chat-type :ukkoclot/src/tg/type-macros)
  (:export
   #:chat
   #:make-chat
@@ -15,7 +15,7 @@
   #:chat-last-name
   #:chat-is-forum
   #:chat-is-direct-messages))
-(in-package :ukkoclot/tg/chat)
+(in-package :ukkoclot/src/tg/chat)
 (define-tg-type chat
  (id integer)
diff --git a/src/tg/delete-message.lisp b/src/tg/delete-message.lisp
index 54cfc8b..cc52371 100644
--- a/src/tg/delete-message.lisp
+++ b/src/tg/delete-message.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/delete-message
+(defpackage :ukkoclot/src/tg/delete-message
-  (:use :c2cl :ukkoclot/tg/message :ukkoclot/tg/method-macros :ukkoclot/tg/send-animation)
+  (:use :c2cl :ukkoclot/src/tg/message :ukkoclot/src/tg/method-macros :ukkoclot/src/tg/send-animation)
  (:export :delete-message :try-delete-message))
-(in-package :ukkoclot/tg/delete-message)
+(in-package :ukkoclot/src/tg/delete-message)
 (define-tg-method (delete-message boolean)
  (chat-id (or integer string))
diff --git a/src/tg/edit-message-text.lisp b/src/tg/edit-message-text.lisp
index 65e2cc7..6038e43 100644
--- a/src/tg/edit-message-text.lisp
+++ b/src/tg/edit-message-text.lisp
@@ -1,16 +1,16 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/edit-message-text
+(defpackage :ukkoclot/src/tg/edit-message-text
  (:use
   :c2cl
-   :ukkoclot/tg/inline-keyboard-markup
+   :ukkoclot/src/tg/inline-keyboard-markup
-   :ukkoclot/tg/link-preview-options
+   :ukkoclot/src/tg/link-preview-options
-   :ukkoclot/tg/message
+   :ukkoclot/src/tg/message
-   :ukkoclot/tg/message-entity
+   :ukkoclot/src/tg/message-entity
-   :ukkoclot/tg/method-macros
+   :ukkoclot/src/tg/method-macros
-   :ukkoclot/tg/parse-mode)
+   :ukkoclot/src/tg/parse-mode)
  (:export :edit-message-text))
-(in-package :ukkoclot/tg/edit-message-text)
+(in-package :ukkoclot/src/tg/edit-message-text)
 ;; TODO: Add a way to simply specify :message msg :)
 (define-tg-method (edit-message-text message)
diff --git a/src/tg/force-reply.lisp b/src/tg/force-reply.lisp
index 21a4ac6..a3e22f3 100644
--- a/src/tg/force-reply.lisp
+++ b/src/tg/force-reply.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/force-reply
+(defpackage :ukkoclot/src/tg/force-reply
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:force-reply
   #:make-force-reply
@@ -10,7 +10,7 @@
   #:force-reply-force-reply
   #:force-reply-input-field-placeholder
   #:force-reply-selective))
-(in-package :ukkoclot/tg/force-reply)
+(in-package :ukkoclot/src/tg/force-reply)
 (define-tg-type force-reply
  (force-reply boolean t :skip-if-default nil)
diff --git a/src/tg/get-me.lisp b/src/tg/get-me.lisp
index d08fb0e..b7e8bc0 100644
--- a/src/tg/get-me.lisp
+++ b/src/tg/get-me.lisp
@@ -1,10 +1,10 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/get-me
+(defpackage :ukkoclot/src/tg/get-me
-  (:use :c2cl :ukkoclot/tg/method-macros :ukkoclot/tg/user)
+  (:use :c2cl :ukkoclot/src/tg/method-macros :ukkoclot/src/tg/user)
-  (:import-from :ukkoclot/state :bot-id% :bot-username%)
+  (:import-from :ukkoclot/src/state :bot-id% :bot-username%)
  (:export :bot-id :bot-username :get-me))
-(in-package :ukkoclot/tg/get-me)
+(in-package :ukkoclot/src/tg/get-me)
 (define-tg-method (get-me% user :GET))
diff --git a/src/tg/get-my-name.lisp b/src/tg/get-my-name.lisp
index a597fe0..b7cb9bc 100644
--- a/src/tg/get-my-name.lisp
+++ b/src/tg/get-my-name.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/get-my-name
+(defpackage :ukkoclot/src/tg/get-my-name
-  (:use :c2cl :ukkoclot/tg/bot-name :ukkoclot/tg/method-macros)
+  (:use :c2cl :ukkoclot/src/tg/bot-name :ukkoclot/src/tg/method-macros)
  (:export :get-my-name))
-(in-package :ukkoclot/tg/get-my-name)
+(in-package :ukkoclot/src/tg/get-my-name)
 (define-tg-method (get-my-name bot-name :GET)
  (language-code (or string null) nil))
diff --git a/src/tg/get-updates.lisp b/src/tg/get-updates.lisp
index 5192e3c..5a4da4f 100644
--- a/src/tg/get-updates.lisp
+++ b/src/tg/get-updates.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/get-updates
+(defpackage :ukkoclot/src/tg/get-updates
-  (:use :c2cl :ukkoclot/tg/method-macros :ukkoclot/tg/update)
+  (:use :c2cl :ukkoclot/src/tg/method-macros :ukkoclot/src/tg/update)
  (:export :get-updates))
-(in-package :ukkoclot/tg/get-updates)
+(in-package :ukkoclot/src/tg/get-updates)
 (define-tg-method (get-updates (array update))
  (offset (or integer null) nil)
diff --git a/src/tg/inline-keyboard-button.lisp b/src/tg/inline-keyboard-button.lisp
index 7b49be6..8d866a3 100644
--- a/src/tg/inline-keyboard-button.lisp
+++ b/src/tg/inline-keyboard-button.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/inline-keyboard-button
+(defpackage :ukkoclot/src/tg/inline-keyboard-button
-  (:use :c2cl :ukkoclot/tg/type-macros :ukkoclot/tg/web-app-info)
+  (:use :c2cl :ukkoclot/src/tg/type-macros :ukkoclot/src/tg/web-app-info)
  (:export
   #:inline-keyboard-button
   #:make-inline-keyboard-button
@@ -14,7 +14,7 @@
   #:inline-keyboard-button-switch-inline-query
   #:inline-keyboard-button-switch-inline-query-current-chat
   #:inline-keyboard-button-pay))
-(in-package :ukkoclot/tg/inline-keyboard-button)
+(in-package :ukkoclot/src/tg/inline-keyboard-button)
 (define-tg-type inline-keyboard-button
  (text string)
diff --git a/src/tg/inline-keyboard-markup.lisp b/src/tg/inline-keyboard-markup.lisp
index a242557..ac5aab4 100644
--- a/src/tg/inline-keyboard-markup.lisp
+++ b/src/tg/inline-keyboard-markup.lisp
@@ -1,14 +1,14 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/inline-keyboard-markup
+(defpackage :ukkoclot/src/tg/inline-keyboard-markup
-  (:use :c2cl :ukkoclot/tg/inline-keyboard-button :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/inline-keyboard-button :ukkoclot/src/tg/type-macros)
  (:export
   #:inline-keyboard-markup
   #:make-inline-keyboard-markup
   #:inline-keyboard-markup-p
   #:copy-inline-keyboard-markup
   #:inline-keyboard-markup-inline-keyboard))
-(in-package :ukkoclot/tg/inline-keyboard-markup)
+(in-package :ukkoclot/src/tg/inline-keyboard-markup)
 (define-tg-type inline-keyboard-markup
  (inline-keyboard (array (array inline-keyboard-button))))
diff --git a/src/tg/keyboard-button-poll-type.lisp b/src/tg/keyboard-button-poll-type.lisp
index 7aecc48..da74da5 100644
--- a/src/tg/keyboard-button-poll-type.lisp
+++ b/src/tg/keyboard-button-poll-type.lisp
@@ -1,14 +1,14 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/keyboard-button-poll-type
+(defpackage :ukkoclot/src/tg/keyboard-button-poll-type
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:keyboard-button-poll-type
   #:make-keyboard-button-poll-type
   #:keyboard-button-poll-type-p
   #:copy-keyboard-button-poll-type
   #:keyboard-button-poll-type-type))
-(in-package :ukkoclot/tg/keyboard-button-poll-type)
+(in-package :ukkoclot/src/tg/keyboard-button-poll-type)
 (define-tg-type keyboard-button-poll-type
  (type (or string null) nil))          ;(member "quiz" "regular") or null
diff --git a/src/tg/keyboard-button-request-chat.lisp b/src/tg/keyboard-button-request-chat.lisp
index 4128571..981487e 100644
--- a/src/tg/keyboard-button-request-chat.lisp
+++ b/src/tg/keyboard-button-request-chat.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/keyboard-button-request-chat
+(defpackage :ukkoclot/src/tg/keyboard-button-request-chat
-  (:use :c2cl :ukkoclot/tg/chat-administrator-rights :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/chat-administrator-rights :ukkoclot/src/tg/type-macros)
  (:export
   #:keyboard-button-request-chat
   #:make-keyboard-button-request-chat
@@ -16,7 +16,7 @@
   #:keyboard-button-request-chat-request-title
   #:keyboard-button-request-chat-request-username
   #:keyboard-button-request-chat-request-photo))
-(in-package :ukkoclot/tg/keyboard-button-request-chat)
+(in-package :ukkoclot/src/tg/keyboard-button-request-chat)
 (define-tg-type keyboard-button-request-chat
  (request-id integer)
diff --git a/src/tg/keyboard-button-request-users.lisp b/src/tg/keyboard-button-request-users.lisp
index 2782870..4a22a21 100644
--- a/src/tg/keyboard-button-request-users.lisp
+++ b/src/tg/keyboard-button-request-users.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/keyboard-button-request-users
+(defpackage :ukkoclot/src/tg/keyboard-button-request-users
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:keyboard-button-request-users
   #:make-keyboard-button-request-users
@@ -12,7 +12,7 @@
   #:keyboard-button-request-users-request-name
   #:keyboard-button-request-users-request-username
   #:keyboard-button-request-users-request-photo))
-(in-package :ukkoclot/tg/keyboard-button-request-users)
+(in-package :ukkoclot/src/tg/keyboard-button-request-users)
 (define-tg-type keyboard-button-request-users
  (request-id integer)
diff --git a/src/tg/keyboard-button.lisp b/src/tg/keyboard-button.lisp
index 7e0791f..264b7c1 100644
--- a/src/tg/keyboard-button.lisp
+++ b/src/tg/keyboard-button.lisp
@@ -1,13 +1,13 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/keyboard-button
+(defpackage :ukkoclot/src/tg/keyboard-button
  (:use
   :c2cl
-   :ukkoclot/tg/keyboard-button-poll-type
+   :ukkoclot/src/tg/keyboard-button-poll-type
-   :ukkoclot/tg/keyboard-button-request-chat
+   :ukkoclot/src/tg/keyboard-button-request-chat
-   :ukkoclot/tg/keyboard-button-request-users
+   :ukkoclot/src/tg/keyboard-button-request-users
-   :ukkoclot/tg/type-macros
+   :ukkoclot/src/tg/type-macros
-   :ukkoclot/tg/web-app-info)
+   :ukkoclot/src/tg/web-app-info)
  (:export
   #:keyboard-button
   #:make-keyboard-button
@@ -20,7 +20,7 @@
   #:keyboard-button-request-location
   #:keyboard-button-request-poll
   #:keyboard-button-web-app))
-(in-package :ukkoclot/tg/keyboard-button)
+(in-package :ukkoclot/src/tg/keyboard-button)
 (define-tg-type keyboard-button
  (text string)
diff --git a/src/tg/link-preview-options.lisp b/src/tg/link-preview-options.lisp
index a6fe618..3d1ff3f 100644
--- a/src/tg/link-preview-options.lisp
+++ b/src/tg/link-preview-options.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/link-preview-options
+(defpackage :ukkoclot/src/tg/link-preview-options
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:link-preview-options
   #:make-link-preview-options
@@ -12,7 +12,7 @@
   #:link-preview-options-prefer-small-media
   #:link-preview-options-prefer-large-media
   #:link-preview-options-show-above-text))
-(in-package :ukkoclot/tg/link-preview-options)
+(in-package :ukkoclot/src/tg/link-preview-options)
 (define-tg-type link-preview-options
  (is-disabled boolean nil)
diff --git a/src/tg/message-entity-type.lisp b/src/tg/message-entity-type.lisp
index f904509..f964667 100644
--- a/src/tg/message-entity-type.lisp
+++ b/src/tg/message-entity-type.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/message-entity-type
+(defpackage :ukkoclot/src/tg/message-entity-type
-  (:use :c2cl :ukkoclot/enum)
+  (:use :c2cl :ukkoclot/src/enum)
  (:export
   :message-entity-type
   :mention
@@ -23,7 +23,7 @@
   :text-link
   :text-mention
   :custom-emoji))
-(in-package :ukkoclot/tg/message-entity-type)
+(in-package :ukkoclot/src/tg/message-entity-type)
 (define-enum message-entity-type
  (mention "mention")
diff --git a/src/tg/message-entity.lisp b/src/tg/message-entity.lisp
index c7e6ba1..feb3e8f 100644
--- a/src/tg/message-entity.lisp
+++ b/src/tg/message-entity.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/message-entity
+(defpackage :ukkoclot/src/tg/message-entity
-  (:use :c2cl :iterate :ukkoclot/tg/type-macros :ukkoclot/tg/message-entity-type :ukkoclot/tg/user)
+  (:use :c2cl :iterate :ukkoclot/src/tg/type-macros :ukkoclot/src/tg/message-entity-type :ukkoclot/src/tg/user)
  (:export
   #:message-entity
   #:make-message-entity
@@ -16,7 +16,7 @@
   #:message-entity-custom-emoji-id
   #:message-entity-extract))
-(in-package :ukkoclot/tg/message-entity)
+(in-package :ukkoclot/src/tg/message-entity)
 (define-tg-type message-entity
  (type message-entity-type)
diff --git a/src/tg/message-reaction-updated.lisp b/src/tg/message-reaction-updated.lisp
index 3792246..896bb9b 100644
--- a/src/tg/message-reaction-updated.lisp
+++ b/src/tg/message-reaction-updated.lisp
@@ -1,12 +1,12 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/message-reaction-updated
+(defpackage :ukkoclot/src/tg/message-reaction-updated
  (:use
   :c2cl
-   :ukkoclot/tg/chat
+   :ukkoclot/src/tg/chat
-   :ukkoclot/tg/type-macros
+   :ukkoclot/src/tg/type-macros
-   :ukkoclot/tg/reaction-type
+   :ukkoclot/src/tg/reaction-type
-   :ukkoclot/tg/user)
+   :ukkoclot/src/tg/user)
  (:export
   #:message-reaction-updated
   #:make-message-reaction-updated
@@ -19,7 +19,7 @@
   #:message-reaction-updated-date
   #:message-reaction-updated-old-reaction
   #:message-reaction-updated-new-reaction))
-(in-package :ukkoclot/tg/message-reaction-updated)
+(in-package :ukkoclot/src/tg/message-reaction-updated)
 (define-tg-type message-reaction-updated
  (chat chat)
diff --git a/src/tg/message.lisp b/src/tg/message.lisp
index e7043bc..6739189 100644
--- a/src/tg/message.lisp
+++ b/src/tg/message.lisp
@@ -1,14 +1,14 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/message
+(defpackage :ukkoclot/src/tg/message
  (:use
   :c2cl
-   :ukkoclot/tg/animation
+   :ukkoclot/src/tg/animation
-   :ukkoclot/tg/chat
+   :ukkoclot/src/tg/chat
-   :ukkoclot/tg/message-entity
+   :ukkoclot/src/tg/message-entity
-   :ukkoclot/tg/photo-size
+   :ukkoclot/src/tg/photo-size
-   :ukkoclot/tg/type-macros
+   :ukkoclot/src/tg/type-macros
-   :ukkoclot/tg/user)
+   :ukkoclot/src/tg/user)
  (:export
   #:message-chat-id
   #:message-thread-id
@@ -57,7 +57,7 @@
   #:message-migrate-from-chat-id
   #:message-pinned-message
   #:message-connected-website))
-(in-package :ukkoclot/tg/message)
+(in-package :ukkoclot/src/tg/message)
 ;; If this is a MaybeInaccessibleMessage date will be 0 if this is inaccessible
 (define-tg-type message
diff --git a/src/tg/method-macros.lisp b/src/tg/method-macros.lisp
index 82da47c..00adf95 100644
--- a/src/tg/method-macros.lisp
+++ b/src/tg/method-macros.lisp
@@ -1,16 +1,16 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/method-macros
+(defpackage :ukkoclot/src/tg/method-macros
  (:documentation "Macros for easy defining TG methods.")
  (:use :c2cl :iterate)
  (:import-from :alexandria :with-gensyms)
  (:import-from :com.dieggsy.f-string :enable-f-strings)
  (:import-from :serapeum :take)
  (:import-from :str)
-  (:import-from :ukkoclot/state :bot)
+  (:import-from :ukkoclot/src/state :bot)
-  (:import-from :ukkoclot/transport :do-call)
+  (:import-from :ukkoclot/src/transport :do-call)
  (:export :define-tg-method))
-(in-package :ukkoclot/tg/method-macros)
+(in-package :ukkoclot/src/tg/method-macros)
 (eval-when (:compile-toplevel :load-toplevel :execute)
  (enable-f-strings))
diff --git a/src/tg/parse-mode.lisp b/src/tg/parse-mode.lisp
index 57ef2af..6fa37c3 100644
--- a/src/tg/parse-mode.lisp
+++ b/src/tg/parse-mode.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/parse-mode
+(defpackage :ukkoclot/src/tg/parse-mode
-  (:use :c2cl :ukkoclot/enum)
+  (:use :c2cl :ukkoclot/src/enum)
  (:export :html :markdown-legacy :markdown :parse-mode))
-(in-package :ukkoclot/tg/parse-mode)
+(in-package :ukkoclot/src/tg/parse-mode)
 (define-enum parse-mode
  (markdown-legacy "Markdown")
diff --git a/src/tg/photo-size.lisp b/src/tg/photo-size.lisp
index f55c0df..af8ff5e 100644
--- a/src/tg/photo-size.lisp
+++ b/src/tg/photo-size.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/photo-size
+(defpackage :ukkoclot/src/tg/photo-size
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:photo-size
   #:make-photo-size
@@ -12,7 +12,7 @@
   #:photo-size-width
   #:photo-size-height
   #:photo-size-file-size))
-(in-package :ukkoclot/tg/photo-size)
+(in-package :ukkoclot/src/tg/photo-size)
 (define-tg-type photo-size
  (file-id string)
diff --git a/src/tg/reaction-type-custom-emoji.lisp b/src/tg/reaction-type-custom-emoji.lisp
index 21cb966..05ed3b7 100644
--- a/src/tg/reaction-type-custom-emoji.lisp
+++ b/src/tg/reaction-type-custom-emoji.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reaction-type-custom-emoji
+(defpackage :ukkoclot/src/tg/reaction-type-custom-emoji
-  (:use :c2cl :ukkoclot/enum :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/enum :ukkoclot/src/tg/type-macros)
  (:export
   #:custom-emoji-type
   #:reaction-type-custom-emoji-type
@@ -10,7 +10,7 @@
   #:reaction-type-custom-emoji-p
   #:copy-reaction-type-custom-emoji
   #:reaction-type-custom-emoji-custom-emoji-id))
-(in-package :ukkoclot/tg/reaction-type-custom-emoji)
+(in-package :ukkoclot/src/tg/reaction-type-custom-emoji)
 (define-enum reaction-type-custom-emoji-type
  (custom-emoji-type "custom_emoji"))
diff --git a/src/tg/reaction-type-emoji.lisp b/src/tg/reaction-type-emoji.lisp
index 6939e41..1e48b01 100644
--- a/src/tg/reaction-type-emoji.lisp
+++ b/src/tg/reaction-type-emoji.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reaction-type-emoji
+(defpackage :ukkoclot/src/tg/reaction-type-emoji
-  (:use :c2cl :ukkoclot/enum :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/enum :ukkoclot/src/tg/type-macros)
  (:export
   #:reaction-type-emoji-type
   #:emoji-type
@@ -10,7 +10,7 @@
   #:reaction-type-emoji-p
   #:copy-reaction-type-emoji
   #:reaction-type-emoji-emoji))
-(in-package :ukkoclot/tg/reaction-type-emoji)
+(in-package :ukkoclot/src/tg/reaction-type-emoji)
 (define-enum reaction-type-emoji-type
  (emoji-type "emoji"))
diff --git a/src/tg/reaction-type-paid.lisp b/src/tg/reaction-type-paid.lisp
index 8d53610..413f9ae 100644
--- a/src/tg/reaction-type-paid.lisp
+++ b/src/tg/reaction-type-paid.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reaction-type-paid
+(defpackage :ukkoclot/src/tg/reaction-type-paid
-  (:use :c2cl :ukkoclot/enum :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/enum :ukkoclot/src/tg/type-macros)
  (:export
   #:reaction-type-paid-type
   #:paid-type
@@ -9,7 +9,7 @@
   #:make-reaction-type-paid
   #:reaction-type-paid-p
   #:copy-reaction-type-paid))
-(in-package :ukkoclot/tg/reaction-type-paid)
+(in-package :ukkoclot/src/tg/reaction-type-paid)
 (define-enum reaction-type-paid-type
  (paid-type "paid"))
diff --git a/src/tg/reaction-type.lisp b/src/tg/reaction-type.lisp
index 1fd07f5..356555d 100644
--- a/src/tg/reaction-type.lisp
+++ b/src/tg/reaction-type.lisp
@@ -1,14 +1,14 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reaction-type
+(defpackage :ukkoclot/src/tg/reaction-type
  (:use
   :c2cl
-   :ukkoclot/tg/type-macros
+   :ukkoclot/src/tg/type-macros
-   :ukkoclot/tg/reaction-type-custom-emoji
+   :ukkoclot/src/tg/reaction-type-custom-emoji
-   :ukkoclot/tg/reaction-type-emoji
+   :ukkoclot/src/tg/reaction-type-emoji
-   :ukkoclot/tg/reaction-type-paid)
+   :ukkoclot/src/tg/reaction-type-paid)
  (:export :reaction-type))
-(in-package :ukkoclot/tg/reaction-type)
+(in-package :ukkoclot/src/tg/reaction-type)
 (deftype reaction-type ()
  '(or reaction-type-emoji reaction-type-custom-emoji reaction-type-paid))
diff --git a/src/tg/reply-keyboard-markup.lisp b/src/tg/reply-keyboard-markup.lisp
index a0c16ca..d6c0af3 100644
--- a/src/tg/reply-keyboard-markup.lisp
+++ b/src/tg/reply-keyboard-markup.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reply-keyboard-markup
+(defpackage :ukkoclot/src/tg/reply-keyboard-markup
-  (:use :c2cl :ukkoclot/tg/keyboard-button :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/keyboard-button :ukkoclot/src/tg/type-macros)
  (:export
   #:reply-keyboard-markup
   #:make-reply-keyboard-markup
@@ -13,7 +13,7 @@
   #:reply-keyboard-markup-one-time-keyboard
   #:reply-keyboard-markup-input-field-placeholder
   #:reply-keyboard-markup-selective))
-(in-package :ukkoclot/tg/reply-keyboard-markup)
+(in-package :ukkoclot/src/tg/reply-keyboard-markup)
 (define-tg-type reply-keyboard-markup
  (keyboard (array (array keyboard-button)))
diff --git a/src/tg/reply-keyboard-remove.lisp b/src/tg/reply-keyboard-remove.lisp
index 595ff31..efed650 100644
--- a/src/tg/reply-keyboard-remove.lisp
+++ b/src/tg/reply-keyboard-remove.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reply-keyboard-remove
+(defpackage :ukkoclot/src/tg/reply-keyboard-remove
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:reply-keyboard-remove
   #:make-reply-keyboard-remove
@@ -9,7 +9,7 @@
   #:copy-reply-keyboard-remove
   #:reply-keyboard-remove-remove-keyboard
   #:reply-keyboard-remove-selective))
-(in-package :ukkoclot/tg/reply-keyboard-remove)
+(in-package :ukkoclot/src/tg/reply-keyboard-remove)
 (define-tg-type reply-keyboard-remove
  (remove-keyboard boolean t :skip-if-default nil)
diff --git a/src/tg/reply-parameters.lisp b/src/tg/reply-parameters.lisp
index 9527c40..d9c7b3b 100644
--- a/src/tg/reply-parameters.lisp
+++ b/src/tg/reply-parameters.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/reply-parameters
+(defpackage :ukkoclot/src/tg/reply-parameters
-  (:use :c2cl :ukkoclot/tg/type-macros :ukkoclot/tg/message-entity)
+  (:use :c2cl :ukkoclot/src/tg/type-macros :ukkoclot/src/tg/message-entity)
  (:export
   #:reply-parameters
   #:make-reply-parameters
@@ -15,7 +15,7 @@
   #:reply-parameters-quote-entities
   #:reply-parameters-quote-position
   #:reply-parameters-checklist-task-id))
-(in-package :ukkoclot/tg/reply-parameters)
+(in-package :ukkoclot/src/tg/reply-parameters)
 (define-tg-type reply-parameters
  (message-id integer)
diff --git a/src/tg/send-animation.lisp b/src/tg/send-animation.lisp
index 1fd7a89..a0b2d57 100644
--- a/src/tg/send-animation.lisp
+++ b/src/tg/send-animation.lisp
@@ -1,20 +1,20 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/send-animation
+(defpackage :ukkoclot/src/tg/send-animation
  (:use
   :c2cl
-   :ukkoclot/tg/force-reply
+   :ukkoclot/src/tg/force-reply
-   :ukkoclot/tg/inline-keyboard-markup
+   :ukkoclot/src/tg/inline-keyboard-markup
-   :ukkoclot/tg/message
+   :ukkoclot/src/tg/message
-   :ukkoclot/tg/message-entity
+   :ukkoclot/src/tg/message-entity
-   :ukkoclot/tg/method-macros
+   :ukkoclot/src/tg/method-macros
-   :ukkoclot/tg/parse-mode
+   :ukkoclot/src/tg/parse-mode
-   :ukkoclot/tg/reply-keyboard-markup
+   :ukkoclot/src/tg/reply-keyboard-markup
-   :ukkoclot/tg/reply-keyboard-remove
+   :ukkoclot/src/tg/reply-keyboard-remove
-   :ukkoclot/tg/reply-parameters
+   :ukkoclot/src/tg/reply-parameters
-   :ukkoclot/tg/suggested-post-parameters)
+   :ukkoclot/src/tg/suggested-post-parameters)
  (:export :reply-animation :send-animation))
-(in-package :ukkoclot/tg/send-animation)
+(in-package :ukkoclot/src/tg/send-animation)
 (define-tg-method (send-animation message)
  (business-connection-id (or string null) nil)
diff --git a/src/tg/send-message.lisp b/src/tg/send-message.lisp
index 164dd83..9edc50d 100644
--- a/src/tg/send-message.lisp
+++ b/src/tg/send-message.lisp
@@ -1,20 +1,20 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/send-message
+(defpackage :ukkoclot/src/tg/send-message
  (:use
   :c2cl
-   :ukkoclot/tg/force-reply
+   :ukkoclot/src/tg/force-reply
-   :ukkoclot/tg/inline-keyboard-markup
+   :ukkoclot/src/tg/inline-keyboard-markup
-   :ukkoclot/tg/link-preview-options
+   :ukkoclot/src/tg/link-preview-options
-   :ukkoclot/tg/message
+   :ukkoclot/src/tg/message
-   :ukkoclot/tg/message-entity
+   :ukkoclot/src/tg/message-entity
-   :ukkoclot/tg/method-macros
+   :ukkoclot/src/tg/method-macros
-   :ukkoclot/tg/parse-mode
+   :ukkoclot/src/tg/parse-mode
-   :ukkoclot/tg/reply-keyboard-markup
+   :ukkoclot/src/tg/reply-keyboard-markup
-   :ukkoclot/tg/reply-keyboard-remove
+   :ukkoclot/src/tg/reply-keyboard-remove
-   :ukkoclot/tg/reply-parameters)
+   :ukkoclot/src/tg/reply-parameters)
  (:export :reply-message :send-message))
-(in-package :ukkoclot/tg/send-message)
+(in-package :ukkoclot/src/tg/send-message)
 (define-tg-method (send-message message)
  (business-connection-id (or string null) nil)
diff --git a/src/tg/set-my-name.lisp b/src/tg/set-my-name.lisp
index 1c6b634..67c698d 100644
--- a/src/tg/set-my-name.lisp
+++ b/src/tg/set-my-name.lisp
@@ -1,9 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/set-my-name
+(defpackage :ukkoclot/src/tg/set-my-name
-  (:use :c2cl :ukkoclot/tg/bot-name :ukkoclot/tg/get-my-name :ukkoclot/tg/method-macros)
+  (:use :c2cl :ukkoclot/src/tg/bot-name :ukkoclot/src/tg/get-my-name :ukkoclot/src/tg/method-macros)
  (:export :set-my-name))
-(in-package :ukkoclot/tg/set-my-name)
+(in-package :ukkoclot/src/tg/set-my-name)
 (define-tg-method (set-my-name% boolean)
  (name (or string null) nil)
diff --git a/src/tg/suggested-post-parameters.lisp b/src/tg/suggested-post-parameters.lisp
index 2bf3753..f68d49a 100644
--- a/src/tg/suggested-post-parameters.lisp
+++ b/src/tg/suggested-post-parameters.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/suggested-post-parameters
+(defpackage :ukkoclot/src/tg/suggested-post-parameters
-  (:use :c2cl :ukkoclot/tg/type-macros :ukkoclot/tg/suggested-post-price)
+  (:use :c2cl :ukkoclot/src/tg/type-macros :ukkoclot/src/tg/suggested-post-price)
  (:export
   #:suggested-post-parameters
   #:make-suggested-post-parameters
@@ -9,7 +9,7 @@
   #:copy-suggested-post-parameters
   #:suggested-post-parameters-price
   #:suggested-post-parameters-send-date))
-(in-package :ukkoclot/tg/suggested-post-parameters)
+(in-package :ukkoclot/src/tg/suggested-post-parameters)
 (define-tg-type suggested-post-parameters
  (price (or suggested-post-price null) nil)
diff --git a/src/tg/suggested-post-price.lisp b/src/tg/suggested-post-price.lisp
index 1369b89..b8eaa21 100644
--- a/src/tg/suggested-post-price.lisp
+++ b/src/tg/suggested-post-price.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/suggested-post-price
+(defpackage :ukkoclot/src/tg/suggested-post-price
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:suggested-post-price
   #:make-suggested-post-price
@@ -9,7 +9,7 @@
   #:copy-suggested-post-price
   #:suggested-post-price-currency
   #:suggested-post-price-amount))
-(in-package :ukkoclot/tg/suggested-post-price)
+(in-package :ukkoclot/src/tg/suggested-post-price)
 (define-tg-type suggested-post-price
  (currency string)                     ;(member "XTR" "TON")
diff --git a/src/tg/type-macros.lisp b/src/tg/type-macros.lisp
index d09359c..914261d 100644
--- a/src/tg/type-macros.lisp
+++ b/src/tg/type-macros.lisp
@@ -1,17 +1,17 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/type-macros
+(defpackage :ukkoclot/src/tg/type-macros
  (:documentation "Macros for easy defining TG types.")
  (:use :c2cl :iterate)
  (:import-from :alexandria :with-gensyms)
  (:import-from :com.dieggsy.f-string :enable-f-strings)
  (:import-from :str)
-  (:import-from :ukkoclot/serializing :parse-value)
+  (:import-from :ukkoclot/src/serializing :parse-value)
-  (:import-from :ukkoclot/hash-tables :gethash-lazy)
+  (:import-from :ukkoclot/src/hash-tables :gethash-lazy)
  (:local-nicknames
   (:jzon :com.inuoe.jzon))
  (:export :define-tg-type))
-(in-package :ukkoclot/tg/type-macros)
+(in-package :ukkoclot/src/tg/type-macros)
 (eval-when (:compile-toplevel :load-toplevel :execute)
  (enable-f-strings))
diff --git a/src/tg/update.lisp b/src/tg/update.lisp
index 90535ed..cc4b6d3 100644
--- a/src/tg/update.lisp
+++ b/src/tg/update.lisp
@@ -1,13 +1,13 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/update
+(defpackage :ukkoclot/src/tg/update
  (:use
   :c2cl
-   :ukkoclot/tg/type-macros
+   :ukkoclot/src/tg/type-macros
-   :ukkoclot/tg/business-connection
+   :ukkoclot/src/tg/business-connection
-   :ukkoclot/tg/callback-query
+   :ukkoclot/src/tg/callback-query
-   :ukkoclot/tg/message
+   :ukkoclot/src/tg/message
-   :ukkoclot/tg/message-reaction-updated)
+   :ukkoclot/src/tg/message-reaction-updated)
  (:export
   #:update
   #:make-update
@@ -23,7 +23,7 @@
   #:update-edited-business-message
   #:update-message-reaction
   #:update-callback-query))
-(in-package :ukkoclot/tg/update)
+(in-package :ukkoclot/src/tg/update)
 (define-tg-type update
  (update-id integer)
diff --git a/src/tg/user.lisp b/src/tg/user.lisp
index b16ee15..2549d66 100644
--- a/src/tg/user.lisp
+++ b/src/tg/user.lisp
@@ -1,8 +1,8 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/user
+(defpackage :ukkoclot/src/tg/user
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
-  (:import-from :ukkoclot/strings :escape-xml)
+  (:import-from :ukkoclot/src/strings :escape-xml)
  (:export
   #:user
   #:make-user
@@ -22,7 +22,7 @@
   #:user-can-connect-to-business
   #:user-format-name))
-(in-package :ukkoclot/tg/user)
+(in-package :ukkoclot/src/tg/user)
 (define-tg-type user
  (id integer)
diff --git a/src/tg/web-app-info.lisp b/src/tg/web-app-info.lisp
index 3f8dc42..6126aa3 100644
--- a/src/tg/web-app-info.lisp
+++ b/src/tg/web-app-info.lisp
@@ -1,14 +1,14 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg/web-app-info
+(defpackage :ukkoclot/src/tg/web-app-info
-  (:use :c2cl :ukkoclot/tg/type-macros)
+  (:use :c2cl :ukkoclot/src/tg/type-macros)
  (:export
   #:web-app-info
   #:make-web-app-info
   #:web-app-info-p
   #:copy-web-app-info
   #:web-app-info-url))
-(in-package :ukkoclot/tg/web-app-info)
+(in-package :ukkoclot/src/tg/web-app-info)
 (define-tg-type web-app-info
  (url string))