basically separated morny-coeur and morny-system-lib project

.run/Morny CLI [pr].run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Morny CLI [pr]" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="cc.sukazyo.cono.morny.MornyCLI" />
-    <module name="Coeur Morny Cono" />
+    <module name="root.Coeur Morny Cono" />
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run" />
     <extension name="coverage">
       <pattern>

.run/Morny Coeur [t][user_dev(env).u_q_c_r_m] [pr].run.xml

@@ -4,7 +4,7 @@
       <option value="$PROJECT_DIR$/.run/debug.env" />
     </option>
     <option name="MAIN_CLASS_NAME" value="cc.sukazyo.cono.morny.core.ServerMain" />
-    <module name="Coeur Morny Cono" />
+    <module name="root.Coeur Morny Cono" />
     <option name="PROGRAM_PARAMETERS" value="--quiet --debug -t --username sukazyo_deving_bot --master 793274677 --trusted-chat -1 --auto-cmd --outdated-ignore --trusted-reader-dinner 1040613596 --report-to 793274677 -medc 793274677 -medt 0,2,18,19 -medtz 8 --dinner-chat -1001670950261" />
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run" />
     <extension name="coverage">

.run/Morny Coeur [user_dev(env).u_q_c] [pr].run.xml

@@ -4,7 +4,7 @@
       <option value="$PROJECT_DIR$/.run/debug.env" />
     </option>
     <option name="MAIN_CLASS_NAME" value="cc.sukazyo.cono.morny.core.ServerMain" />
-    <module name="Coeur Morny Cono" />
+    <module name="root.Coeur Morny Cono" />
     <option name="PROGRAM_PARAMETERS" value="--quiet --debug --username sukazyo_deving_bot --master 793274677 --trusted-chat -1 --outdated-ignore --trusted-reader-dinner 1040613596 -medc 793274677 -medtz 8 --dinner-chat -1001670950261" />
     <option name="VM_PARAMETERS" value="-Djava.net.useSystemProxies=true" />
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run" />

.run/Morny Coeur [user_dev(env).u_q_c_r_m] [pr].run.xml

@@ -4,7 +4,7 @@
       <option value="$PROJECT_DIR$/.run/debug.env" />
     </option>
     <option name="MAIN_CLASS_NAME" value="cc.sukazyo.cono.morny.core.ServerMain" />
-    <module name="Coeur Morny Cono" />
+    <module name="root.Coeur Morny Cono" />
     <option name="PROGRAM_PARAMETERS" value="--quiet --debug --username sukazyo_deving_bot --master 793274677 --trusted-chat -1 --auto-cmd --outdated-ignore --trusted-reader-dinner 1040613596 --report-to 793274677 -medc 793274677 -medt 0,2,18,19 -medtz 8 --dinner-chat -1001670950261" />
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run" />
     <extension name="coverage">

.run/ServerMain [only-hello].run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ServerMain [only-hello]" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="cc.sukazyo.cono.morny.core.ServerMain" />
-    <module name="Coeur Morny Cono" />
+    <module name="root.Coeur Morny Cono" />
     <option name="PROGRAM_PARAMETERS" value="--only-hello" />
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run" />
     <extension name="coverage">

.run/ServerMain [version].run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ServerMain [version]" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="cc.sukazyo.cono.morny.core.ServerMain" />
-    <module name="Coeur Morny Cono" />
+    <module name="root.Coeur Morny Cono" />
     <option name="PROGRAM_PARAMETERS" value="--version" />
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run" />
     <extension name="coverage">

build.sbt

@@ -1,37 +1,79 @@
 aether.AetherKeys.aetherOldVersionMethod := true
 
-ThisBuild / organization := "cc.sukazyo"
-ThisBuild / organizationName := "A.C. Sukazyo Eyre"
+ThisBuild / organization := MornyProject.group
+ThisBuild / organizationName := MornyProject.group_name
+
+ThisBuild / version := MornyProject.version
 
 ThisBuild / scalaVersion := "3.4.1"
 
-resolvers ++= Seq(
+ThisBuild / resolvers ++= Seq(
 		"-ws-releases" at "https://mvn.sukazyo.cc/releases"
 )
 
-lazy val root = (project in file("."))
+ThisBuild / crossPaths := false
+
+ThisBuild / Compile / packageDoc / publishArtifact := false
+artifactName := {(sv: ScalaVersion, module: ModuleID, artifact: Artifact) =>
+	val classifier = artifact.classifier match {
+		case Some(value) => s"-$value"
+		case None => ""
+	}
+	s"${module.name}-${module.revision}$classifier.${artifact.extension}"
+}
+
+ThisBuild / scalacOptions ++= Seq(
+	"-language:postfixOps",
+	"-encoding", MornyProject.source_encoding
+)
+ThisBuild / javacOptions ++= Seq(
+	"-encoding", MornyProject.source_encoding,
+	"-source", "17",
+	"-target", "17"
+)
+ThisBuild / autoAPIMappings := true
+ThisBuild / apiMappings ++= {
+	def mappingsFor(organization: String, names: List[String], location: String, revision: String => String = identity): Seq[(File, URL)] =
+		for {
+			entry: Attributed[File] <- (Compile / fullClasspath).value
+			module: ModuleID <- entry.get(moduleID.key)
+			if module.organization == organization
+			if names.exists(module.name.startsWith)
+		} yield entry.data -> url(location.format(revision(module.revision)))
+	val mappings: Seq[(File, URL)] = Seq(
+		mappingsFor("org.scala-lang", List("scala-library"), "https://scala-lang.org/api/%s/"),
+		mappingsFor("com.github.pengrad", "java-telegram-bot-api"::Nil, "https://jitpack.io/com/github/pengrad/java-telegram-bot-api/6.3.0/javadoc/"),
+	).flatten
+	mappings.toMap
+}
+
+ThisBuild / publishTo := MornyProject.publishTo
+ThisBuild / credentials ++= MornyProject.publishCredentials
+
+lazy val morny_system_lib = (project in file (MornyProject.morny_system_lib.id))
 		.enablePlugins(BuildInfoPlugin)
 		.settings(
 			
-			name := "Coeur Morny Cono",
-			version := MornyProject.version,
+			name := MornyProject.morny_system_lib.name,
+			moduleName := MornyProject.morny_system_lib.id,
 			
-			crossPaths := false,
-			moduleName := MornyProject.app_archive_name,
-			Compile / packageDoc / publishArtifact := false,
-			artifactName := {(sv: ScalaVersion, module: ModuleID, artifact: Artifact) =>
-				val classifier = artifact.classifier match {
-					case Some(value) => s"-$value"
-					case None => ""
-				}
-				s"${module.name}-${MornyProject.version_full}$classifier.${artifact.extension}"
-			},
+			libraryDependencies ++= MornyProject.morny_system_lib.dependencies,
 			
-			Compile / mainClass := Some(MornyProject.app_application_main),
+		)
+
+lazy val morny_coeur = (project in file(MornyProject.morny_coeur.id))
+		.enablePlugins(BuildInfoPlugin)
+		.dependsOn(morny_system_lib)
+		.settings(
 			
-			libraryDependencies ++= MornyProject.dependencies,
+			name := MornyProject.morny_coeur.name,
+			moduleName := MornyProject.morny_coeur.id,
 			
-			buildInfoPackage := MornyProject.app_package,
+			Compile / mainClass := Some(MornyProject.morny_coeur.main_class),
+			
+			libraryDependencies ++= MornyProject.morny_coeur.dependencies,
+			
+			buildInfoPackage := MornyProject.morny_coeur.root_package,
 			buildInfoObject := "BuildConfig",
 			buildInfoKeys ++= Seq(
 				BuildInfoKey[String]("VERSION", MornyProject.version),
@@ -46,31 +88,6 @@ lazy val root = (project in file("."))
 				BuildInfoKey[String]("COMMIT_PATH", MornyProject.git_store_path),
 			),
 			
-			scalacOptions ++= Seq(
-				"-language:postfixOps",
-				"-encoding", MornyProject.source_encoding
-			),
-			javacOptions ++= Seq(
-				"-encoding", MornyProject.source_encoding,
-				"-source", "17",
-				"-target", "17"
-			),
-			autoAPIMappings := true,
-			apiMappings ++= {
-				def mappingsFor(organization: String, names: List[String], location: String, revision: String => String = identity): Seq[(File, URL)] =
-					for {
-						entry: Attributed[File] <- (Compile / fullClasspath).value
-						module: ModuleID <- entry.get(moduleID.key)
-						if module.organization == organization
-						if names.exists(module.name.startsWith)
-					} yield entry.data -> url(location.format(revision(module.revision)))
-				val mappings: Seq[(File, URL)] = Seq(
-					mappingsFor("org.scala-lang", List("scala-library"), "https://scala-lang.org/api/%s/"),
-					mappingsFor("com.github.pengrad", "java-telegram-bot-api"::Nil, "https://jitpack.io/com/github/pengrad/java-telegram-bot-api/6.3.0/javadoc/"),
-				).flatten
-				mappings.toMap
-			},
-			
 			assemblyMergeStrategy := {
 				case module if module endsWith "module-info.class" => MergeStrategy.concat
 				case module_kt if module_kt endsWith ".kotlin_module" => MergeStrategy.concat
@@ -88,11 +105,11 @@ lazy val root = (project in file("."))
 				assembly / assemblyJarName := {
 					sLog.value info "environment DOCKER_BUILD checked"
 					sLog.value info "assembly will output for docker build (morny-coeur-docker-build.jar)"
-					"morny-coeur-docker-build.jar"
+					s"${MornyProject.morny_coeur.id}-docker-build.jar"
 				}
 			} else Nil,
 			
-			publishTo := MornyProject.publishTo,
-			credentials ++= MornyProject.publishCredentials,
-			
 		)
+
+lazy val root = (project in file ("."))
+		.aggregate(morny_system_lib, morny_coeur)

morny-coeur/.gitignore

@@ -0,0 +1,3 @@
+
+# builds
+/target

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/call_me/OnCallMe.scala

@@ -1,10 +1,10 @@
 package cc.sukazyo.cono.morny.call_me
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.*
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.*
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.model.{Chat, Message, User}
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.{ForwardMessage, GetChat, SendMessage, SendSticker}
@@ -75,9 +75,9 @@ class OnCallMe (using coeur: MornyCoeur) extends EventListener {
 				lastDinnerData.forwardFromChat.id,
 				lastDinnerData.forwardFromMessageId
 			).unsafeExecute
+			import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
+			import cc.sukazyo.cono.morny.system.utils.EpochDateTime.EpochMillis
 			import cc.sukazyo.cono.morny.util.CommonFormat.{formatDate, formatDuration}
-			import cc.sukazyo.cono.morny.util.EpochDateTime.EpochMillis
-			import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
 			def lastDinner_dateMillis: EpochMillis = EpochMillis fromSeconds lastDinnerData.forwardDate
 			SendMessage(
 				req.from.id,

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/call_me/OnCallMsgSend.scala

@@ -1,9 +1,9 @@
 package cc.sukazyo.cono.morny.call_me
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.*
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.*
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.model.{Chat, Message, MessageEntity}
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.{GetChat, SendMessage, SendSticker}
@@ -115,8 +115,8 @@ class OnCallMsgSend (using coeur: MornyCoeur) extends EventListener {
 		val targetChatResponse = GetChat(messageToSend.targetId).execute
 		if (targetChatResponse isOk) {
 			def getChatDescriptionHTML (chat: Chat): String =
-				import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.*
-				import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
+				import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.*
+				import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
 				// language=html
 				s"""<i><u>${h(chat.id toString)}</u>@${h(chat.`type`.name)}</i>${if (chat.`type` != Chat.Type.Private) ":::" else ""}
 				   |${chat.typeTag} <b>${h(chat.safe_name)}</b> ${chat.safe_linkHTML}"""

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala

@@ -10,10 +10,10 @@ import cc.sukazyo.cono.morny.core.http.api.{HttpServer, MornyHttpServerContext}
 import cc.sukazyo.cono.morny.core.http.internal.MornyHttpServerContextImpl
 import cc.sukazyo.cono.morny.core.module.ModuleHelper
 import cc.sukazyo.cono.morny.reporter.MornyReport
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.EpochMillis
+import cc.sukazyo.cono.morny.system.utils.GivenContext
 import cc.sukazyo.cono.morny.util.schedule.Scheduler
-import cc.sukazyo.cono.morny.util.EpochDateTime.EpochMillis
 import cc.sukazyo.cono.morny.util.time.WatchDog
-import cc.sukazyo.cono.morny.util.GivenContext
 import cc.sukazyo.cono.morny.util.UseString.MString
 import cc.sukazyo.cono.morny.util.UseThrowable.toLogString
 import cc.sukazyo.cono.morny.util.dataview.Table
@@ -358,7 +358,7 @@ class MornyCoeur (modules: List[MornyModule])(using val config: MornyConfig)(tes
 	  *     translations.trans(/* ... */)
 	  *     // or use as an implicit/using value
 	  *     import com.pengrad.telegrambot.request.SendMessage
-	  *     import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+	  *     import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
 	  *     SendMessage(/* ... */)
 	  *         .unsafeExecute // implicitly use coeur.account
 	  *
@@ -458,7 +458,7 @@ class MornyCoeur (modules: List[MornyModule])(using val config: MornyConfig)(tes
 			for (i <- 0 to 3) {
 				if i > 0 then logger `info` "retrying..."
 				try {
-					import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.execute
+					import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.execute
 					val remote = GetMe().execute(using account).user
 					if ((config.telegramBotUsername ne null) && config.telegramBotUsername != remote.username)
 						throw RuntimeException(s"Required the bot @${config.telegramBotUsername} but @${remote.username} logged in")

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornySystem.scala

@@ -2,7 +2,7 @@ package cc.sukazyo.cono.morny.core
 
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.internal.BuildConfigField
-import cc.sukazyo.cono.morny.util.EpochDateTime.EpochMillis
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.EpochMillis
 import cc.sukazyo.cono.morny.util.FileUtils
 import cc.sukazyo.cono.morny.BuildConfig
 import cc.sukazyo.cono.morny.util.UseThrowable.toLogString

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyTrusted.scala

@@ -1,8 +1,8 @@
 package cc.sukazyo.cono.morny.core
 
 import cc.sukazyo.cono.morny.core.Log.logger
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.{LimboChat, LimboUser}
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Chat.*
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.{LimboChat, LimboUser}
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Chat.*
 import com.pengrad.telegrambot.model.ChatMember.Status
 import com.pengrad.telegrambot.TelegramBot
 import com.pengrad.telegrambot.model.User

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/EventListenerManager.scala

@@ -3,7 +3,7 @@ package cc.sukazyo.cono.morny.core.bot.api
 import cc.sukazyo.cono.morny.core.{Log, MornyCoeur}
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.reporter.MornyReport
-import cc.sukazyo.cono.morny.util.tgapi.event.EventRuntimeException
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener, EventRuntimeException}
 import cc.sukazyo.cono.morny.util.UseThrowable.toLogString
 import com.google.gson.GsonBuilder
 import com.pengrad.telegrambot.model.Update

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyCommandManager.scala

@@ -3,8 +3,8 @@ package cc.sukazyo.cono.morny.core.bot.api
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{InputCommand, ISimpleCommand, ITelegramCommand}
 import com.pengrad.telegrambot.model.{BotCommand, DeleteMyCommands, Update}
 import com.pengrad.telegrambot.request.{SendSticker, SetMyCommands}
 import com.pengrad.telegrambot.TelegramBot

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyQueryManager.scala

@@ -1,6 +1,7 @@
 package cc.sukazyo.cono.morny.core.bot.api
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
+import cc.sukazyo.cono.morny.system.telegram_api.inline_query.{InlineQueryUnit, ITelegramQuery}
 import com.pengrad.telegrambot.model.Update
 
 import scala.collection.mutable

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/SimpleCommandManager.scala

@@ -1,6 +1,7 @@
 package cc.sukazyo.cono.morny.core.bot.api
 
 import cc.sukazyo.cono.morny.core.bot.api.MornyCommandManager.CommandMap
+import cc.sukazyo.cono.morny.system.telegram_api.command.ISimpleCommand
 
 import scala.collection.mutable
 

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessageThread.scala

@@ -1,8 +1,8 @@
 package cc.sukazyo.cono.morny.core.bot.api.messages
 
 import cc.sukazyo.cono.morny.core.bot.api.messages.MessageThread.{CallbackParameterized, ThreadKey}
-import cc.sukazyo.cono.morny.util.tgapi.Standardize.{ChatID, UserID}
-import cc.sukazyo.cono.morny.util.EpochDateTime.DurationMillis
+import cc.sukazyo.cono.morny.system.telegram_api.Standardize.{ChatID, UserID}
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.DurationMillis
 import com.pengrad.telegrambot.model.Message
 
 trait MessageThread [P] {

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessagingContext.scala

@@ -1,6 +1,6 @@
 package cc.sukazyo.cono.morny.core.bot.api.messages
 
-import cc.sukazyo.cono.morny.util.tgapi.Standardize.*
+import cc.sukazyo.cono.morny.system.telegram_api.Standardize.*
 import com.pengrad.telegrambot.model.{Chat, Message, User}
 
 /**

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/DirectMsgClear.scala

@@ -2,10 +2,9 @@ package cc.sukazyo.cono.morny.core.bot.command
 
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ISimpleCommand}
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
 import com.pengrad.telegrambot.model.{Chat, Update}
 import com.pengrad.telegrambot.request.{DeleteMessage, GetChatMember, SendSticker}
 import com.pengrad.telegrambot.TelegramBot

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyHellos.scala

@@ -1,13 +1,13 @@
 package cc.sukazyo.cono.morny.core.bot.command
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener, ICommandAlias, ITelegramCommand}
-import cc.sukazyo.cono.morny.core.bot.api.ICommandAlias.ListedAlias
 import cc.sukazyo.cono.morny.core.bot.api.messages.MessagingContext
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Chat.notOfType
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.ICommandAlias.ListedAlias
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Chat.notOfType
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand}
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.model.{Chat, Update}
 import com.pengrad.telegrambot.request.SendSticker
 import com.pengrad.telegrambot.TelegramBot

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInfoOnStart.scala

@@ -1,10 +1,9 @@
 package cc.sukazyo.cono.morny.core.bot.command
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ISimpleCommand}
 import cc.sukazyo.cono.morny.data.MornyInformation.{getAboutPic, getMornyAboutLinksVars}
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
 import com.pengrad.telegrambot.model.Update
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.SendPhoto

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala

@@ -1,15 +1,14 @@
 package cc.sukazyo.cono.morny.core.bot.command
 
 import cc.sukazyo.cono.morny.core.{MornyCoeur, MornySystem}
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ITelegramCommand}
 import cc.sukazyo.cono.morny.core.bot.api.messages.{ErrorMessage, MessagingContext}
 import cc.sukazyo.cono.morny.data.MornyInformation.*
 import cc.sukazyo.cono.morny.data.TelegramStickers
 import cc.sukazyo.cono.morny.reporter.MornyReport
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand}
 import cc.sukazyo.cono.morny.util.CommonFormat.{formatDate, formatDuration}
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
 import cc.sukazyo.cono.morny.util.var_text
 import cc.sukazyo.cono.morny.util.var_text.VarText
 import com.pengrad.telegrambot.model.Update

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformationOlds.scala

@@ -1,7 +1,6 @@
 package cc.sukazyo.cono.morny.core.bot.command
 
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ISimpleCommand}
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
 import com.pengrad.telegrambot.model.Update
 
 class MornyInformationOlds (using base: MornyInformation) {

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala

@@ -1,15 +1,15 @@
 package cc.sukazyo.cono.morny.core.bot.command
 
-import cc.sukazyo.cono.morny.core.bot.api.ICommandAlias.HiddenAlias
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{messages, ICommandAlias, ISimpleCommand, ITelegramCommand}
+import cc.sukazyo.cono.morny.core.bot.api.messages
 import cc.sukazyo.cono.morny.core.bot.api.messages.MessagingContext
 import cc.sukazyo.cono.morny.data.TelegramStickers
 import cc.sukazyo.cono.morny.reporter.MornyReport
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.*
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.ICommandAlias.HiddenAlias
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.*
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand, ITelegramCommand}
 import com.pengrad.telegrambot.model.Update
 import com.pengrad.telegrambot.request.{EditMessageText, SendMessage, SendSticker}
 

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnInlineQuery.scala

@@ -1,8 +1,10 @@
 package cc.sukazyo.cono.morny.core.bot.event
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener, InlineQueryUnit, MornyQueryManager}
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.core.bot.api.MornyQueryManager
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
+import cc.sukazyo.cono.morny.system.telegram_api.inline_query.InlineQueryUnit
 import com.pengrad.telegrambot.model.request.InlineQueryResult
 import com.pengrad.telegrambot.request.AnswerInlineQuery
 import com.pengrad.telegrambot.TelegramBot

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnTelegramCommand.scala

@@ -2,8 +2,9 @@ package cc.sukazyo.cono.morny.core.bot.event
 
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener, MornyCommandManager}
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
+import cc.sukazyo.cono.morny.core.bot.api.MornyCommandManager
+import cc.sukazyo.cono.morny.system.telegram_api.command.InputCommand
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.model.{Message, Update}
 
 class MornyOnTelegramCommand (using commandManager: MornyCommandManager) (using coeur: MornyCoeur) extends EventListener {

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnUpdateTimestampOffsetLock.scala

@@ -1,9 +1,9 @@
 package cc.sukazyo.cono.morny.core.bot.event
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Update.sourceTime
-import cc.sukazyo.cono.morny.util.EpochDateTime.EpochMillis
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Update.sourceTime
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.EpochMillis
 
 class MornyOnUpdateTimestampOffsetLock (using coeur: MornyCoeur) extends EventListener {
 	

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ErrorMessageManager.scala

@@ -1,12 +1,11 @@
 package cc.sukazyo.cono.morny.core.bot.internal
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ISimpleCommand}
 import cc.sukazyo.cono.morny.core.bot.api.messages.{ErrorMessage, MessagingContext}
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.DurationMillis
 import cc.sukazyo.cono.morny.util.schedule.{DelayedTask, Scheduler}
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
-import cc.sukazyo.cono.morny.util.EpochDateTime.DurationMillis
 import com.pengrad.telegrambot.TelegramBot
 import com.pengrad.telegrambot.model.Update
 import com.pengrad.telegrambot.request.{AbstractSendRequest, SendMessage}

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ThreadingManagerImpl.scala

@@ -1,11 +1,11 @@
 package cc.sukazyo.cono.morny.core.bot.internal
 
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener, ICommandAlias, ISimpleCommand}
 import cc.sukazyo.cono.morny.core.bot.api.messages.{MessageThread, MessagingContext, ThreadingManager}
 import cc.sukazyo.cono.morny.core.bot.api.messages.MessageThread.{Callback, CallbackParameterized, ThreadKey}
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import cc.sukazyo.cono.morny.util.schedule.{DelayedTask, Scheduler, Task}
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
 import com.pengrad.telegrambot.model.{Message, Update}
 import com.pengrad.telegrambot.TelegramBot
 import com.pengrad.telegrambot.request.SendMessage

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/crons/cmd/CommandCreate.scala

@@ -1,11 +1,10 @@
 package cc.sukazyo.cono.morny.crons.cmd
 
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ISimpleCommand}
 import cc.sukazyo.cono.morny.core.MornyCoeur
 import cc.sukazyo.cono.morny.core.bot.api.messages.{ErrorMessage, MessagingContext}
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
 import cc.sukazyo.cono.morny.util.UseThrowable.toLogString
 import com.cronutils.descriptor.CronDescriptor
 import com.cronutils.model.{Cron, CronType}

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/encrypt_tool/Encryptor.scala

@@ -2,16 +2,15 @@ package cc.sukazyo.cono.morny.encrypt_tool
 
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ITelegramCommand}
-import cc.sukazyo.cono.morny.core.bot.api.ICommandAlias.ListedAlias
 import cc.sukazyo.cono.morny.data.TelegramStickers
 import cc.sukazyo.cono.morny.reporter.MornyReport
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.CommonEncrypt
-import cc.sukazyo.cono.morny.util.CommonEncrypt.*
-import cc.sukazyo.cono.morny.util.ConvertByteHex.toHex
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.File.getContent
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.ICommandAlias.ListedAlias
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.File.getContent
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand}
+import cc.sukazyo.cono.morny.system.utils.CommonEncrypt
+import cc.sukazyo.cono.morny.system.utils.CommonEncrypt.*
+import cc.sukazyo.cono.morny.system.utils.ConvertByteHex.toHex
 import com.pengrad.telegrambot.model.{PhotoSize, Update}
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.{GetFile, SendDocument, SendMessage, SendSticker}
@@ -203,7 +202,7 @@ class Encryptor (using coeur: MornyCoeur) extends ITelegramCommand {
 				).fileName(_file.resultName).replyToMessageId(event.message.messageId)
 					.unsafeExecute
 			case _text: EXTextLike =>
-				import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
+				import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
 				SendMessage(
 					event.message.chat.id,
 					// language=html

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/ip186/BotCommand.scala

@@ -1,9 +1,8 @@
 package cc.sukazyo.cono.morny.ip186
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ITelegramCommand}
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand}
 import com.pengrad.telegrambot.model.Update
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.SendMessage
@@ -54,7 +53,7 @@ class BotCommand (using coeur: MornyCoeur) {
 			return;
 		
 		
-		import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
+		import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
 		try {
 			
 			val response = command.command match

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/medication_timer/MedicationTimer.scala

@@ -3,10 +3,10 @@ package cc.sukazyo.cono.morny.medication_timer
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
 import cc.sukazyo.cono.morny.medication_timer.MedicationTimer.calcNextRoutineTimestamp
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.EpochMillis
 import cc.sukazyo.cono.morny.util.schedule.RoutineTask
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
 import cc.sukazyo.cono.morny.util.CommonFormat
-import cc.sukazyo.cono.morny.util.EpochDateTime.EpochMillis
 import com.cronutils.builder.CronBuilder
 import com.cronutils.model.definition.{CronDefinition, CronDefinitionBuilder}
 import com.cronutils.model.time.ExecutionTime

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/medication_timer/OnMedicationNotifyApply.scala

@@ -1,7 +1,7 @@
 package cc.sukazyo.cono.morny.medication_timer
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.model.Message
 
 class OnMedicationNotifyApply (using instance: MedicationTimer)(using coeur: MornyCoeur) extends EventListener {

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/morny_misc/MornyJrrp.scala

@@ -1,6 +1,6 @@
 package cc.sukazyo.cono.morny.morny_misc
 
-import cc.sukazyo.cono.morny.util.EpochDateTime.{EpochDays, EpochMillis}
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.{EpochDays, EpochMillis}
 import com.pengrad.telegrambot.model.User
 
 import scala.language.postfixOps
@@ -11,8 +11,8 @@ object MornyJrrp {
 		jrrp_v_xmomi(user.id, EpochDays fromMillis timestamp) * 100.0
 	
 	private def jrrp_v_xmomi (identifier: Long, dayStamp: EpochDays): Double =
-		import cc.sukazyo.cono.morny.util.CommonEncrypt.MD5
-		import cc.sukazyo.cono.morny.util.ConvertByteHex.toHex
+		import cc.sukazyo.cono.morny.system.utils.CommonEncrypt.MD5
+		import cc.sukazyo.cono.morny.system.utils.ConvertByteHex.toHex
 		java.lang.Long.parseLong(MD5(s"$identifier@$dayStamp").toHex.substring(0, 4), 16) / (0xffff toDouble)
 	
 }

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/morny_misc/MornyOldJrrp.scala

@@ -1,10 +1,9 @@
 package cc.sukazyo.cono.morny.morny_misc
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ITelegramCommand}
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.*
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.*
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand}
 import com.pengrad.telegrambot.model.Update
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.SendMessage
@@ -27,7 +26,7 @@ class MornyOldJrrp (using coeur: MornyCoeur) extends ITelegramCommand {
 			case a if a > 30 => ";"
 			case _ => "..."
 		
-		import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
+		import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
 		SendMessage(
 			event.message.chat.id,
 			// language=html

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/morny_misc/Testing.scala

@@ -1,11 +1,10 @@
 package cc.sukazyo.cono.morny.morny_misc
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ISimpleCommand}
 import cc.sukazyo.cono.morny.core.bot.api.messages.{ErrorMessage, MessagingContext}
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ISimpleCommand}
 import com.pengrad.telegrambot.model.{Message, Update}
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.{SendMessage, SendSticker}

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/nbnhhsh/CommandNbnhhsh.scala

@@ -2,11 +2,10 @@ package cc.sukazyo.cono.morny.nbnhhsh
 
 import cc.sukazyo.cono.morny.core.Log.logger
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{ICommandAlias, ITelegramCommand}
 import cc.sukazyo.cono.morny.data.TelegramStickers
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
-import cc.sukazyo.cono.morny.util.tgapi.InputCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand}
 import com.pengrad.telegrambot.model.Update
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.{SendMessage, SendSticker}

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/randomize_somthing/OnQuestionMarkReply.scala

@@ -1,9 +1,9 @@
 package cc.sukazyo.cono.morny.randomize_somthing
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
 import cc.sukazyo.cono.morny.randomize_somthing.OnQuestionMarkReply.isAllMessageMark
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.request.SendMessage
 import com.pengrad.telegrambot.TelegramBot
 

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/randomize_somthing/OnUserRandom.scala

@@ -1,8 +1,8 @@
 package cc.sukazyo.cono.morny.randomize_somthing
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
 import com.pengrad.telegrambot.request.SendMessage
 import com.pengrad.telegrambot.TelegramBot
 

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/MornyReport.scala

@@ -2,18 +2,17 @@ package cc.sukazyo.cono.morny.reporter
 
 import cc.sukazyo.cono.morny.core.{MornyCoeur, MornyConfig}
 import cc.sukazyo.cono.morny.core.Log.logger
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
 import cc.sukazyo.cono.morny.data.MornyInformation.getVersionAllFullTagHTML
-import cc.sukazyo.cono.morny.util.statistics.{NumericStatistics, UniqueCounter}
-import cc.sukazyo.cono.morny.util.tgapi.event.EventRuntimeException
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.*
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
-import cc.sukazyo.cono.morny.util.EpochDateTime.DurationMillis
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener, EventRuntimeException}
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.*
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Update.{sourceChat, sourceUser}
+import cc.sukazyo.cono.morny.system.utils.CommonEncrypt.hashId
+import cc.sukazyo.cono.morny.system.utils.ConvertByteHex.toHex
+import cc.sukazyo.cono.morny.system.utils.EpochDateTime.DurationMillis
 import cc.sukazyo.cono.morny.util.schedule.CronTask
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Update.{sourceChat, sourceUser}
-import cc.sukazyo.cono.morny.util.CommonEncrypt.hashId
-import cc.sukazyo.cono.morny.util.ConvertByteHex.toHex
+import cc.sukazyo.cono.morny.util.statistics.{NumericStatistics, UniqueCounter}
 import cc.sukazyo.cono.morny.util.UseThrowable.toLogString
 import com.cronutils.builder.CronBuilder
 import com.cronutils.model.Cron
@@ -183,8 +182,8 @@ class MornyReport (using coeur: MornyCoeur) {
 					   | - <i>total</i>: <code>${f(value.total)}</code>""".stripMargin
 		
 		def eventStatisticsHTML: String =
+			import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.ChatTypeTag.*
 			import cc.sukazyo.cono.morny.util.UseMath.percentageOf as p
-			import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.ChatTypeTag.*
 			val processed = runningTime.count
 			val canceled = eventCanceled
 			val ignored = eventTotal - processed - canceled

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/slash_action/OnUserSlashAction.scala

@@ -1,11 +1,11 @@
 package cc.sukazyo.cono.morny.slash_action
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.{EventEnv, EventListener}
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramFormatter.*
-import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h
-import cc.sukazyo.cono.morny.util.UniversalCommand
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.*
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener}
+import cc.sukazyo.cono.morny.system.utils.UniversalCommand
 import com.pengrad.telegrambot.model.request.ParseMode
 import com.pengrad.telegrambot.request.SendMessage
 import com.pengrad.telegrambot.TelegramBot

morny-coeur/src/main/scala/cc/sukazyo/cono/morny/social_share/api/SocialContent.scala

@@ -1,11 +1,11 @@
 package cc.sukazyo.cono.morny.social_share.api
 
 import cc.sukazyo.cono.morny.core.MornyCoeur
-import cc.sukazyo.cono.morny.core.bot.api.InlineQueryUnit
 import cc.sukazyo.cono.morny.social_share.api.SocialContent.{SocialMedia, SocialMediaType, SocialMediaWithUrl}
 import cc.sukazyo.cono.morny.social_share.api.SocialContent.SocialMediaType.{Photo, Video}
-import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Requests.unsafeExecute
-import cc.sukazyo.cono.morny.util.tgapi.formatting.NamingUtils.inlineQueryId
+import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute
+import cc.sukazyo.cono.morny.system.telegram_api.formatting.NamingUtils.inlineQueryId
+import cc.sukazyo.cono.morny.system.telegram_api.inline_query.InlineQueryUnit
 import com.pengrad.telegrambot.model.request.*
 import com.pengrad.telegrambot.request.{SendMediaGroup, SendMessage}
 import com.pengrad.telegrambot.TelegramBot