diff --git a/.gitignore b/.gitignore
index 4cb512e..925c749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/.env
\ No newline at end of file
+/.env
+__pycache__/
\ No newline at end of file
diff --git a/main.py b/main.py
index de62735..9d46b4e 100644
--- a/main.py
+++ b/main.py
@@ -1,28 +1,5 @@
-# 導入 套件
-import discord
-import os
-from dotenv import load_dotenv
+from src.discordBot import DiscordBot
 
-# 取得環境設定
-load_dotenv()
-DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
-# intents
-intents = discord.Intents.default()
-# client
-client = discord.Client(intents=intents)
 
-# event 事件處理
-@client.event
-async def on_ready():
-  print(f"「{client.user}」已登入")
-
-@client.event
-async def on_message(message):
-  if message.author == client.user: # 排除機器人本身的訊息
-    return
-  if message.content == 'ping':
-    await message.channel.send('pong')
-
-
-if __name__ == "__main__":
-  client.run(DISCORD_TOKEN)
\ No newline at end of file
+dcBot = DiscordBot()
+dcBot.start()
\ No newline at end of file
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/discordBot.py b/src/discordBot.py
new file mode 100644
index 0000000..41914a8
--- /dev/null
+++ b/src/discordBot.py
@@ -0,0 +1,34 @@
+# 導入 套件
+import discord
+import os
+from dotenv import load_dotenv
+
+# 取得環境設定
+load_dotenv()
+DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
+# intents
+intents = discord.Intents.default()
+intents.message_content = True
+# client
+client = discord.Client(intents=intents)
+
+class DiscordBot():
+  def __init__(self) -> None:
+    pass
+
+  def start(self):
+    client.run(DISCORD_TOKEN)
+
+
+# event 事件處理
+@client.event
+async def on_ready():
+  print(f"「{client.user}」已登入")
+
+@client.event
+async def on_message(message):
+  print(message) # 印出message 內容
+  if message.author == client.user: # 排除機器人本身的訊息
+    return
+  if message.content == 'ping':
+    await message.channel.send('pong')