41 files changed, 168 insertions, 168 deletions

diff --git a/src/bot/advanced.lisp b/src/bot/advanced.lisp
index 241b04d..635bdb0 100644
--- a/src/bot/advanced.lisp
+++ b/src/bot/advanced.lisp
@@ -1,7 +1,7 @@
 ;; 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-types)
+  (:use :c2cl :ukkoclot/bot/impl :ukkoclot/bot/methods :ukkoclot/tg)
   (:export :bot-id :bot-username :reply-animation :reply-message :try-delete-message))
 (in-package :ukkoclot/bot/advanced)
 
diff --git a/src/bot/methods.lisp b/src/bot/methods.lisp
index 984646a..6ef507c 100644
--- a/src/bot/methods.lisp
+++ b/src/bot/methods.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/methods
-  (:use :c2cl :ukkoclot/bot/impl :ukkoclot/tg-types :ukkoclot/tg-types/macros)
+  (:use :c2cl :ukkoclot/bot/impl :ukkoclot/tg :ukkoclot/tg/macros)
   (: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)
 
diff --git a/src/inline-bots.lisp b/src/inline-bots.lisp
index 3c6b7c4..08568d2 100644
--- a/src/inline-bots.lisp
+++ b/src/inline-bots.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/inline-bots
-  (:use :c2cl :ukkoclot/bot :ukkoclot/config :ukkoclot/tg-types)
+  (:use :c2cl :ukkoclot/bot :ukkoclot/config :ukkoclot/tg)
   (:import-from :log)
   (:local-nicknames (:db :ukkoclot/db))
   (:export :blacklist-inline-bot :on-inline-bot :whitelist-inline-bot))
diff --git a/src/main.lisp b/src/main.lisp
index f90bfb3..862526b 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -2,7 +2,7 @@
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/main
   (:nicknames :ukkoclot)
-  (:use :c2cl :ukkoclot/bot :ukkoclot/config :ukkoclot/inline-bots :ukkoclot/tg-types)
+  (:use :c2cl :ukkoclot/bot :ukkoclot/config :ukkoclot/inline-bots :ukkoclot/tg)
   (:import-from :anaphora :acond :awhen :it)
   (:import-from :log)
   (:import-from :ukkoclot/bot :make-bot :bot-power-on :fixup-value)
diff --git a/src/tg-types.lisp b/src/tg-types.lisp
deleted file mode 100644
index 24d4923..0000000
--- a/src/tg-types.lisp
+++ /dev/null
@@ -1,40 +0,0 @@
-;; SPDX-License-Identifier: EUPL-1.2
-;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(uiop:define-package :ukkoclot/tg-types
-  (:use)
-  (:use-reexport
-   :ukkoclot/tg-types/animation
-   :ukkoclot/tg-types/bot-name
-   :ukkoclot/tg-types/business-bot-rights
-   :ukkoclot/tg-types/business-connection
-   :ukkoclot/tg-types/callback-query
-   :ukkoclot/tg-types/chat
-   :ukkoclot/tg-types/chat-type
-   :ukkoclot/tg-types/chat-administrator-rights
-   :ukkoclot/tg-types/force-reply
-   :ukkoclot/tg-types/inline-keyboard-button
-   :ukkoclot/tg-types/inline-keyboard-markup
-   :ukkoclot/tg-types/keyboard-button
-   :ukkoclot/tg-types/keyboard-button-poll-type
-   :ukkoclot/tg-types/keyboard-button-request-chat
-   :ukkoclot/tg-types/keyboard-button-request-users
-   :ukkoclot/tg-types/link-preview-options
-   :ukkoclot/tg-types/message
-   :ukkoclot/tg-types/message-entity
-   :ukkoclot/tg-types/message-entity-type
-   :ukkoclot/tg-types/message-reaction-updated
-   :ukkoclot/tg-types/parse-mode
-   :ukkoclot/tg-types/photo-size
-   :ukkoclot/tg-types/reaction-type
-   :ukkoclot/tg-types/reaction-type-custom-emoji
-   :ukkoclot/tg-types/reaction-type-emoji
-   :ukkoclot/tg-types/reaction-type-paid
-   :ukkoclot/tg-types/reply-keyboard-markup
-   :ukkoclot/tg-types/reply-keyboard-remove
-   :ukkoclot/tg-types/reply-parameters
-   :ukkoclot/tg-types/suggested-post-parameters
-   :ukkoclot/tg-types/suggested-post-price
-   :ukkoclot/tg-types/update
-   :ukkoclot/tg-types/user
-   :ukkoclot/tg-types/web-app-info
-   ))
diff --git a/src/tg.lisp b/src/tg.lisp
new file mode 100644
index 0000000..e12f04a
--- /dev/null
+++ b/src/tg.lisp
@@ -0,0 +1,40 @@
+;; SPDX-License-Identifier: EUPL-1.2
+;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
+(uiop:define-package :ukkoclot/tg
+  (:use)
+  (:use-reexport
+   :ukkoclot/tg/animation
+   :ukkoclot/tg/bot-name
+   :ukkoclot/tg/business-bot-rights
+   :ukkoclot/tg/business-connection
+   :ukkoclot/tg/callback-query
+   :ukkoclot/tg/chat
+   :ukkoclot/tg/chat-type
+   :ukkoclot/tg/chat-administrator-rights
+   :ukkoclot/tg/force-reply
+   :ukkoclot/tg/inline-keyboard-button
+   :ukkoclot/tg/inline-keyboard-markup
+   :ukkoclot/tg/keyboard-button
+   :ukkoclot/tg/keyboard-button-poll-type
+   :ukkoclot/tg/keyboard-button-request-chat
+   :ukkoclot/tg/keyboard-button-request-users
+   :ukkoclot/tg/link-preview-options
+   :ukkoclot/tg/message
+   :ukkoclot/tg/message-entity
+   :ukkoclot/tg/message-entity-type
+   :ukkoclot/tg/message-reaction-updated
+   :ukkoclot/tg/parse-mode
+   :ukkoclot/tg/photo-size
+   :ukkoclot/tg/reaction-type
+   :ukkoclot/tg/reaction-type-custom-emoji
+   :ukkoclot/tg/reaction-type-emoji
+   :ukkoclot/tg/reaction-type-paid
+   :ukkoclot/tg/reply-keyboard-markup
+   :ukkoclot/tg/reply-keyboard-remove
+   :ukkoclot/tg/reply-parameters
+   :ukkoclot/tg/suggested-post-parameters
+   :ukkoclot/tg/suggested-post-price
+   :ukkoclot/tg/update
+   :ukkoclot/tg/user
+   :ukkoclot/tg/web-app-info
+   ))
diff --git a/src/tg-types/animation.lisp b/src/tg/animation.lisp
index 421dcc7..d17db94 100644
--- a/src/tg-types/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-types/animation
-  (:use :c2cl :ukkoclot/tg-types/macros :ukkoclot/tg-types/photo-size)
+(defpackage :ukkoclot/tg/animation
+  (:use :c2cl :ukkoclot/tg/macros :ukkoclot/tg/photo-size)
   (:export
    #:animation
    #:make-animation
@@ -16,7 +16,7 @@
    #:animation-file-name
    #:animation-mime-type
    #:animation-file-size))
-(in-package :ukkoclot/tg-types/animation)
+(in-package :ukkoclot/tg/animation)
 
 (define-tg-type animation
   (file-id string)
diff --git a/src/tg-types/bot-name.lisp b/src/tg/bot-name.lisp
index b42765c..933ce8c 100644
--- a/src/tg-types/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-types/bot-name
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/bot-name
+  (:use :c2cl :ukkoclot/tg/macros)
   (:export
    #:bot-name
    #:make-bot-name
    #:bot-name-p
    #:copy-bot-name
    #:bot-name-name))
-(in-package :ukkoclot/tg-types/bot-name)
+(in-package :ukkoclot/tg/bot-name)
 
 (define-tg-type bot-name
   (name string))
diff --git a/src/tg-types/business-bot-rights.lisp b/src/tg/business-bot-rights.lisp
index 7a65dcd..f5a44c0 100644
--- a/src/tg-types/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-types/business-bot-rights
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/business-bot-rights
+  (:use :c2cl :ukkoclot/tg/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-types/business-bot-rights)
+(in-package :ukkoclot/tg/business-bot-rights)
 
 (define-tg-type business-bot-rights
   (can-reply boolean nil)
diff --git a/src/tg-types/business-connection.lisp b/src/tg/business-connection.lisp
index 04fe7c4..74f6c9e 100644
--- a/src/tg-types/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-types/business-connection
+(defpackage :ukkoclot/tg/business-connection
   (:use
    :c2cl
-   :ukkoclot/tg-types/macros
-   :ukkoclot/tg-types/business-bot-rights
-   :ukkoclot/tg-types/user)
+   :ukkoclot/tg/macros
+   :ukkoclot/tg/business-bot-rights
+   :ukkoclot/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-types/business-connection)
+(in-package :ukkoclot/tg/business-connection)
 
 (define-tg-type business-connection
   (id string)
diff --git a/src/tg-types/callback-query.lisp b/src/tg/callback-query.lisp
index 875ff25..6b89755 100644
--- a/src/tg-types/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-types/callback-query
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/callback-query
+  (:use :c2cl :ukkoclot/tg/macros)
   (:use
-   :ukkoclot/tg-types/message
-   :ukkoclot/tg-types/user)
+   :ukkoclot/tg/message
+   :ukkoclot/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-types/callback-query)
+(in-package :ukkoclot/tg/callback-query)
 
 (define-tg-type callback-query
   (id string)
diff --git a/src/tg-types/chat-administrator-rights.lisp b/src/tg/chat-administrator-rights.lisp
index 37c1ce0..2c37757 100644
--- a/src/tg-types/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-types/chat-administrator-rights
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/chat-administrator-rights
+  (:use :c2cl :ukkoclot/tg/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-types/chat-administrator-rights)
+(in-package :ukkoclot/tg/chat-administrator-rights)
 
 (define-tg-type chat-administrator-rights
   (is-anonymous boolean)
diff --git a/src/tg-types/chat-type.lisp b/src/tg/chat-type.lisp
index dc9147a..daf135a 100644
--- a/src/tg-types/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-types/chat-type
+(defpackage :ukkoclot/tg/chat-type
   (:use :c2cl :ukkoclot/enum)
   (:export :channel :chat-type :group :private :supergroup))
-(in-package :ukkoclot/tg-types/chat-type)
+(in-package :ukkoclot/tg/chat-type)
 
 (define-enum chat-type
   (private "private")
diff --git a/src/tg-types/chat.lisp b/src/tg/chat.lisp
index d4af5a1..1fa3f7e 100644
--- a/src/tg-types/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-types/chat
-  (:use :c2cl :ukkoclot/tg-types/chat-type :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/chat
+  (:use :c2cl :ukkoclot/tg/chat-type :ukkoclot/tg/macros)
   (:export
    #:chat
    #:make-chat
@@ -15,7 +15,7 @@
    #:chat-last-name
    #:chat-is-forum
    #:chat-is-direct-messages))
-(in-package :ukkoclot/tg-types/chat)
+(in-package :ukkoclot/tg/chat)
 
 (define-tg-type chat
   (id integer)
diff --git a/src/tg-types/force-reply.lisp b/src/tg/force-reply.lisp
index 5dc49fb..816eb75 100644
--- a/src/tg-types/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-types/force-reply
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/force-reply
+  (:use :c2cl :ukkoclot/tg/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-types/force-reply)
+(in-package :ukkoclot/tg/force-reply)
 
 (define-tg-type force-reply
   (force-reply boolean t :skip-if-default nil)
diff --git a/src/tg-types/inline-keyboard-button.lisp b/src/tg/inline-keyboard-button.lisp
index e3b3533..e403f2a 100644
--- a/src/tg-types/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-types/inline-keyboard-button
-  (:use :c2cl :ukkoclot/tg-types/macros :ukkoclot/tg-types/web-app-info)
+(defpackage :ukkoclot/tg/inline-keyboard-button
+  (:use :c2cl :ukkoclot/tg/macros :ukkoclot/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-types/inline-keyboard-button)
+(in-package :ukkoclot/tg/inline-keyboard-button)
 
 (define-tg-type inline-keyboard-button
   (text string)
diff --git a/src/tg-types/inline-keyboard-markup.lisp b/src/tg/inline-keyboard-markup.lisp
index bb7b9c1..023b87f 100644
--- a/src/tg-types/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-types/inline-keyboard-markup
-  (:use :c2cl :ukkoclot/tg-types/inline-keyboard-button :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/inline-keyboard-markup
+  (:use :c2cl :ukkoclot/tg/inline-keyboard-button :ukkoclot/tg/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-types/inline-keyboard-markup)
+(in-package :ukkoclot/tg/inline-keyboard-markup)
 
 (define-tg-type inline-keyboard-markup
   (inline-keyboard (array (array inline-keyboard-button))))
diff --git a/src/tg-types/keyboard-button-poll-type.lisp b/src/tg/keyboard-button-poll-type.lisp
index fdd7b92..7b5b063 100644
--- a/src/tg-types/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-types/keyboard-button-poll-type
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/keyboard-button-poll-type
+  (:use :c2cl :ukkoclot/tg/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-types/keyboard-button-poll-type)
+(in-package :ukkoclot/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-types/keyboard-button-request-chat.lisp b/src/tg/keyboard-button-request-chat.lisp
index aab8512..07f0d27 100644
--- a/src/tg-types/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-types/keyboard-button-request-chat
-  (:use :c2cl :ukkoclot/tg-types/chat-administrator-rights :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/keyboard-button-request-chat
+  (:use :c2cl :ukkoclot/tg/chat-administrator-rights :ukkoclot/tg/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-types/keyboard-button-request-chat)
+(in-package :ukkoclot/tg/keyboard-button-request-chat)
 
 (define-tg-type keyboard-button-request-chat
   (request-id integer)
diff --git a/src/tg-types/keyboard-button-request-users.lisp b/src/tg/keyboard-button-request-users.lisp
index 9b20c3d..82b9151 100644
--- a/src/tg-types/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-types/keyboard-button-request-users
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/keyboard-button-request-users
+  (:use :c2cl :ukkoclot/tg/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-types/keyboard-button-request-users)
+(in-package :ukkoclot/tg/keyboard-button-request-users)
 
 (define-tg-type keyboard-button-request-users
   (request-id integer)
diff --git a/src/tg-types/keyboard-button.lisp b/src/tg/keyboard-button.lisp
index fac64e6..79c87d6 100644
--- a/src/tg-types/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-types/keyboard-button
+(defpackage :ukkoclot/tg/keyboard-button
   (:use
    :c2cl
-   :ukkoclot/tg-types/keyboard-button-poll-type
-   :ukkoclot/tg-types/keyboard-button-request-chat
-   :ukkoclot/tg-types/keyboard-button-request-users
-   :ukkoclot/tg-types/macros
-   :ukkoclot/tg-types/web-app-info)
+   :ukkoclot/tg/keyboard-button-poll-type
+   :ukkoclot/tg/keyboard-button-request-chat
+   :ukkoclot/tg/keyboard-button-request-users
+   :ukkoclot/tg/macros
+   :ukkoclot/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-types/keyboard-button)
+(in-package :ukkoclot/tg/keyboard-button)
 
 (define-tg-type keyboard-button
   (text string)
diff --git a/src/tg-types/link-preview-options.lisp b/src/tg/link-preview-options.lisp
index 450a9ea..7ed4859 100644
--- a/src/tg-types/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-types/link-preview-options
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/link-preview-options
+  (:use :c2cl :ukkoclot/tg/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-types/link-preview-options)
+(in-package :ukkoclot/tg/link-preview-options)
 
 (define-tg-type link-preview-options
   (is-disabled boolean nil)
diff --git a/src/tg-types/macros.lisp b/src/tg/macros.lisp
index a8a3d96..92afd6e 100644
--- a/src/tg-types/macros.lisp
+++ b/src/tg/macros.lisp
@@ -1,6 +1,6 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg-types/macros
+(defpackage :ukkoclot/tg/macros
   (:use :c2cl)
   (:import-from :ukkoclot/bot/impl :bot :do-call :parse-value)
   (:import-from :ukkoclot/hash-tables :gethash-lazy)
@@ -8,7 +8,7 @@
   (:local-nicknames
    (:jzon :com.inuoe.jzon))
   (:export :define-tg-method :define-tg-type))
-(in-package :ukkoclot/tg-types/macros)
+(in-package :ukkoclot/tg/macros)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defstruct (field (:constructor make-field%)) name type default skip-if-default)
diff --git a/src/tg-types/message-entity-type.lisp b/src/tg/message-entity-type.lisp
index f34c44a..f904509 100644
--- a/src/tg-types/message-entity-type.lisp
+++ b/src/tg/message-entity-type.lisp
@@ -1,6 +1,6 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg-types/message-entity-type
+(defpackage :ukkoclot/tg/message-entity-type
   (:use :c2cl :ukkoclot/enum)
   (:export
    :message-entity-type
@@ -23,7 +23,7 @@
    :text-link
    :text-mention
    :custom-emoji))
-(in-package :ukkoclot/tg-types/message-entity-type)
+(in-package :ukkoclot/tg/message-entity-type)
 
 (define-enum message-entity-type
   (mention "mention")
diff --git a/src/tg-types/message-entity.lisp b/src/tg/message-entity.lisp
index 1eb96cb..c5be269 100644
--- a/src/tg-types/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-types/message-entity
-  (:use :c2cl :iterate :ukkoclot/tg-types/macros :ukkoclot/tg-types/message-entity-type :ukkoclot/tg-types/user)
+(defpackage :ukkoclot/tg/message-entity
+  (:use :c2cl :iterate :ukkoclot/tg/macros :ukkoclot/tg/message-entity-type :ukkoclot/tg/user)
   (:export
    #:message-entity
    #:make-message-entity
@@ -16,7 +16,7 @@
    #:message-entity-custom-emoji-id
 
    #:message-entity-extract))
-(in-package :ukkoclot/tg-types/message-entity)
+(in-package :ukkoclot/tg/message-entity)
 
 (define-tg-type message-entity
   (type message-entity-type)
diff --git a/src/tg-types/message-reaction-updated.lisp b/src/tg/message-reaction-updated.lisp
index 38d506f..f91a8f1 100644
--- a/src/tg-types/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-types/message-reaction-updated
+(defpackage :ukkoclot/tg/message-reaction-updated
   (:use
    :c2cl
-   :ukkoclot/tg-types/chat
-   :ukkoclot/tg-types/macros
-   :ukkoclot/tg-types/reaction-type
-   :ukkoclot/tg-types/user)
+   :ukkoclot/tg/chat
+   :ukkoclot/tg/macros
+   :ukkoclot/tg/reaction-type
+   :ukkoclot/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-types/message-reaction-updated)
+(in-package :ukkoclot/tg/message-reaction-updated)
 
 (define-tg-type message-reaction-updated
   (chat chat)
diff --git a/src/tg-types/message.lisp b/src/tg/message.lisp
index c402af2..18eb5c4 100644
--- a/src/tg-types/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-types/message
+(defpackage :ukkoclot/tg/message
   (:use
    :c2cl
-   :ukkoclot/tg-types/animation
-   :ukkoclot/tg-types/chat
-   :ukkoclot/tg-types/macros
-   :ukkoclot/tg-types/message-entity
-   :ukkoclot/tg-types/photo-size
-   :ukkoclot/tg-types/user)
+   :ukkoclot/tg/animation
+   :ukkoclot/tg/chat
+   :ukkoclot/tg/macros
+   :ukkoclot/tg/message-entity
+   :ukkoclot/tg/photo-size
+   :ukkoclot/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-types/message)
+(in-package :ukkoclot/tg/message)
 
 ;; If this is a MaybeInaccessibleMessage date will be 0 if this is inaccessible
 (define-tg-type message
diff --git a/src/tg-types/parse-mode.lisp b/src/tg/parse-mode.lisp
index 80c24aa..57ef2af 100644
--- a/src/tg-types/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-types/parse-mode
+(defpackage :ukkoclot/tg/parse-mode
   (:use :c2cl :ukkoclot/enum)
   (:export :html :markdown-legacy :markdown :parse-mode))
-(in-package :ukkoclot/tg-types/parse-mode)
+(in-package :ukkoclot/tg/parse-mode)
 
 (define-enum parse-mode
   (markdown-legacy "Markdown")
diff --git a/src/tg-types/photo-size.lisp b/src/tg/photo-size.lisp
index 2c8906d..32b586c 100644
--- a/src/tg-types/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-types/photo-size
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/photo-size
+  (:use :c2cl :ukkoclot/tg/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-types/photo-size)
+(in-package :ukkoclot/tg/photo-size)
 
 (define-tg-type photo-size
   (file-id string)
diff --git a/src/tg-types/reaction-type-custom-emoji.lisp b/src/tg/reaction-type-custom-emoji.lisp
index 353e78f..9191f1e 100644
--- a/src/tg-types/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-types/reaction-type-custom-emoji
-  (:use :c2cl :ukkoclot/enum :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/reaction-type-custom-emoji
+  (:use :c2cl :ukkoclot/enum :ukkoclot/tg/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-types/reaction-type-custom-emoji)
+(in-package :ukkoclot/tg/reaction-type-custom-emoji)
 
 (define-enum reaction-type-custom-emoji-type
   (custom-emoji-type "custom_emoji"))
diff --git a/src/tg-types/reaction-type-emoji.lisp b/src/tg/reaction-type-emoji.lisp
index c7aeebb..bf4920a 100644
--- a/src/tg-types/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-types/reaction-type-emoji
-  (:use :c2cl :ukkoclot/enum :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/reaction-type-emoji
+  (:use :c2cl :ukkoclot/enum :ukkoclot/tg/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-types/reaction-type-emoji)
+(in-package :ukkoclot/tg/reaction-type-emoji)
 
 (define-enum reaction-type-emoji-type
   (emoji-type "emoji"))
diff --git a/src/tg-types/reaction-type-paid.lisp b/src/tg/reaction-type-paid.lisp
index 260ddf7..f5b1bfd 100644
--- a/src/tg-types/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-types/reaction-type-paid
-  (:use :c2cl :ukkoclot/enum :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/reaction-type-paid
+  (:use :c2cl :ukkoclot/enum :ukkoclot/tg/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-types/reaction-type-paid)
+(in-package :ukkoclot/tg/reaction-type-paid)
 
 (define-enum reaction-type-paid-type
   (paid-type "paid"))
diff --git a/src/tg-types/reaction-type.lisp b/src/tg/reaction-type.lisp
index 4eb0d0b..35bf4cd 100644
--- a/src/tg-types/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-types/reaction-type
+(defpackage :ukkoclot/tg/reaction-type
   (:use
    :c2cl
-   :ukkoclot/tg-types/macros
-   :ukkoclot/tg-types/reaction-type-custom-emoji
-   :ukkoclot/tg-types/reaction-type-emoji
-   :ukkoclot/tg-types/reaction-type-paid)
+   :ukkoclot/tg/macros
+   :ukkoclot/tg/reaction-type-custom-emoji
+   :ukkoclot/tg/reaction-type-emoji
+   :ukkoclot/tg/reaction-type-paid)
   (:export :reaction-type))
-(in-package :ukkoclot/tg-types/reaction-type)
+(in-package :ukkoclot/tg/reaction-type)
 
 (deftype reaction-type ()
   '(or reaction-type-emoji reaction-type-custom-emoji reaction-type-paid))
diff --git a/src/tg-types/reply-keyboard-markup.lisp b/src/tg/reply-keyboard-markup.lisp
index f4b5d45..2674c10 100644
--- a/src/tg-types/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-types/reply-keyboard-markup
-  (:use :c2cl :ukkoclot/tg-types/keyboard-button :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/reply-keyboard-markup
+  (:use :c2cl :ukkoclot/tg/keyboard-button :ukkoclot/tg/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-types/reply-keyboard-markup)
+(in-package :ukkoclot/tg/reply-keyboard-markup)
 
 (define-tg-type reply-keyboard-markup
   (keyboard (array (array keyboard-button)))
diff --git a/src/tg-types/reply-keyboard-remove.lisp b/src/tg/reply-keyboard-remove.lisp
index 9925d82..908e46d 100644
--- a/src/tg-types/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-types/reply-keyboard-remove
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/reply-keyboard-remove
+  (:use :c2cl :ukkoclot/tg/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-types/reply-keyboard-remove)
+(in-package :ukkoclot/tg/reply-keyboard-remove)
 
 (define-tg-type reply-keyboard-remove
   (remove-keyboard boolean t :skip-if-default nil)
diff --git a/src/tg-types/reply-parameters.lisp b/src/tg/reply-parameters.lisp
index ac38db7..e41d837 100644
--- a/src/tg-types/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-types/reply-parameters
-  (:use :c2cl :ukkoclot/tg-types/macros :ukkoclot/tg-types/message-entity)
+(defpackage :ukkoclot/tg/reply-parameters
+  (:use :c2cl :ukkoclot/tg/macros :ukkoclot/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-types/reply-parameters)
+(in-package :ukkoclot/tg/reply-parameters)
 
 (define-tg-type reply-parameters
   (message-id integer)
diff --git a/src/tg-types/suggested-post-parameters.lisp b/src/tg/suggested-post-parameters.lisp
index bf781fc..525272a 100644
--- a/src/tg-types/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-types/suggested-post-parameters
-  (:use :c2cl :ukkoclot/tg-types/macros :ukkoclot/tg-types/suggested-post-price)
+(defpackage :ukkoclot/tg/suggested-post-parameters
+  (:use :c2cl :ukkoclot/tg/macros :ukkoclot/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-types/suggested-post-parameters)
+(in-package :ukkoclot/tg/suggested-post-parameters)
 
 (define-tg-type suggested-post-parameters
   (price (or suggested-post-price null) nil)
diff --git a/src/tg-types/suggested-post-price.lisp b/src/tg/suggested-post-price.lisp
index e5b6cb3..9012e75 100644
--- a/src/tg-types/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-types/suggested-post-price
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/suggested-post-price
+  (:use :c2cl :ukkoclot/tg/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-types/suggested-post-price)
+(in-package :ukkoclot/tg/suggested-post-price)
 
 (define-tg-type suggested-post-price
   (currency string)                     ;(member "XTR" "TON")
diff --git a/src/tg-types/update.lisp b/src/tg/update.lisp
index be4cb32..1f0a463 100644
--- a/src/tg-types/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-types/update
+(defpackage :ukkoclot/tg/update
   (:use
    :c2cl
-   :ukkoclot/tg-types/macros
-   :ukkoclot/tg-types/business-connection
-   :ukkoclot/tg-types/callback-query
-   :ukkoclot/tg-types/message
-   :ukkoclot/tg-types/message-reaction-updated)
+   :ukkoclot/tg/macros
+   :ukkoclot/tg/business-connection
+   :ukkoclot/tg/callback-query
+   :ukkoclot/tg/message
+   :ukkoclot/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-types/update)
+(in-package :ukkoclot/tg/update)
 
 (define-tg-type update
   (update-id integer)
diff --git a/src/tg-types/user.lisp b/src/tg/user.lisp
index b5be417..c5b5b4d 100644
--- a/src/tg-types/user.lisp
+++ b/src/tg/user.lisp
@@ -1,7 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/tg-types/user
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/user
+  (:use :c2cl :ukkoclot/tg/macros)
   (:import-from :ukkoclot/strings :escape-xml)
   (:export
    #:user
@@ -22,7 +22,7 @@
    #:user-can-connect-to-business
 
    #:user-format-name))
-(in-package :ukkoclot/tg-types/user)
+(in-package :ukkoclot/tg/user)
 
 (define-tg-type user
   (id integer)
diff --git a/src/tg-types/web-app-info.lisp b/src/tg/web-app-info.lisp
index e239830..8e96df2 100644
--- a/src/tg-types/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-types/web-app-info
-  (:use :c2cl :ukkoclot/tg-types/macros)
+(defpackage :ukkoclot/tg/web-app-info
+  (:use :c2cl :ukkoclot/tg/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-types/web-app-info)
+(in-package :ukkoclot/tg/web-app-info)
 
 (define-tg-type web-app-info
   (url string))