diff --git a/lib/commands.ex b/lib/HahaCommands/download.ex
similarity index 79%
rename from lib/commands.ex
rename to lib/HahaCommands/download.ex
index 3d0c317..931fca9 100644
--- a/lib/commands.ex
+++ b/lib/HahaCommands/download.ex
@@ -1,24 +1,10 @@
-defmodule HahaCommands do
+defmodule HahaYes.Commands.Download do
   @moduledoc """
   Contain all the function for each commands
   """
 
   alias Nostrum.Api
 
-  @doc """
-  Reply with a simple "Pong!"
-
-  ## Example
-
-    User: h3h3 ping
-
-    Bot: Pong!
-  """
-
-  def ping(msg) do
-    Api.create_message(msg.channel_id, "Pong!")
-  end
-
   @doc """
   Download the video sent by the user at 480p max.
 
@@ -36,7 +22,7 @@ defmodule HahaCommands do
 
     Bot: <video file>
   """
-  def download(msg) do
+  def execute(msg) do
     arg = String.replace(msg.content, "h3h3 download ", "")
     opt = ["-f", "bestvideo[height<=?480]+bestaudio/best", arg, "-o", "#{System.tmp_dir}/test.mp4", "--force-overwrites", "--playlist-reverse", "--no-playlist", "--remux-video=mp4/webm/mov", "--no-warnings"];
 
diff --git a/lib/HahaCommands/ping.ex b/lib/HahaCommands/ping.ex
new file mode 100644
index 0000000..4809552
--- /dev/null
+++ b/lib/HahaCommands/ping.ex
@@ -0,0 +1,21 @@
+defmodule HahaYes.Commands.Ping do
+  @moduledoc """
+  Contain all the function for each commands
+  """
+
+  alias Nostrum.Api
+
+  @doc """
+  Reply with a simple "Pong!"
+
+  ## Example
+
+    User: h3h3 ping
+
+    Bot: Pong!
+  """
+
+  def execute(msg) do
+    Api.create_message(msg.channel_id, "Pong!")
+  end
+end