diff --git a/apps/scrapper/lib/scrapper/data/model/match/info.ex b/apps/scrapper/lib/scrapper/data/api/match/info.ex
similarity index 82%
rename from apps/scrapper/lib/scrapper/data/model/match/info.ex
rename to apps/scrapper/lib/scrapper/data/api/match/info.ex
index a2ee26f..835bccc 100644
--- a/apps/scrapper/lib/scrapper/data/model/match/info.ex
+++ b/apps/scrapper/lib/scrapper/data/api/match/info.ex
@@ -1,5 +1,5 @@
-defmodule Scrapper.Data.Model.Match.Info do
-  alias Scrapper.Data.Model.Match.Participant
+defmodule Scrapper.Data.Api.Model.Match.Info do
+  alias Scrapper.Data.Api.Model.Match.Participant
 
   defstruct endOfGameResult: "",
             gameCreation: "",
diff --git a/apps/scrapper/lib/scrapper/data/api/match/match_response.ex b/apps/scrapper/lib/scrapper/data/api/match/match_response.ex
new file mode 100644
index 0000000..d5b2929
--- /dev/null
+++ b/apps/scrapper/lib/scrapper/data/api/match/match_response.ex
@@ -0,0 +1,6 @@
+defmodule Scrapper.Data.Api.Model.Match.MatchResponse do
+  alias Scrapper.Data.Api.Model.Match.{Info, Metadata}
+
+  defstruct metadata: %Metadata{},
+            info: %Info{}
+end
diff --git a/apps/scrapper/lib/scrapper/data/model/match/metadata.ex b/apps/scrapper/lib/scrapper/data/api/match/metadata.ex
similarity index 51%
rename from apps/scrapper/lib/scrapper/data/model/match/metadata.ex
rename to apps/scrapper/lib/scrapper/data/api/match/metadata.ex
index 248626a..ad34572 100644
--- a/apps/scrapper/lib/scrapper/data/model/match/metadata.ex
+++ b/apps/scrapper/lib/scrapper/data/api/match/metadata.ex
@@ -1,3 +1,3 @@
-defmodule Scrapper.Data.Model.Match.Metadata do
+defmodule Scrapper.Data.Api.Model.Match.Metadata do
   defstruct [:dataVersion, :matchId, :participants]
 end
diff --git a/apps/scrapper/lib/scrapper/data/model/match/participant.ex b/apps/scrapper/lib/scrapper/data/api/match/participant.ex
similarity index 98%
rename from apps/scrapper/lib/scrapper/data/model/match/participant.ex
rename to apps/scrapper/lib/scrapper/data/api/match/participant.ex
index 7b8dfa8..1007aa0 100644
--- a/apps/scrapper/lib/scrapper/data/model/match/participant.ex
+++ b/apps/scrapper/lib/scrapper/data/api/match/participant.ex
@@ -1,4 +1,4 @@
-defmodule Scrapper.Data.Model.Match.Participant do
+defmodule Scrapper.Data.Api.Model.Match.Participant do
   # Enum.map(participant, fn {k,_v} -> ":#{k}" end) |> Enum.join(", ")
   defstruct [
     :onMyWayPings,
diff --git a/apps/scrapper/lib/scrapper/data/match_api.ex b/apps/scrapper/lib/scrapper/data/api/match_api.ex
similarity index 91%
rename from apps/scrapper/lib/scrapper/data/match_api.ex
rename to apps/scrapper/lib/scrapper/data/api/match_api.ex
index b11ddd4..38f970d 100644
--- a/apps/scrapper/lib/scrapper/data/match_api.ex
+++ b/apps/scrapper/lib/scrapper/data/api/match_api.ex
@@ -1,4 +1,4 @@
-defmodule Scrapper.Data.MatchApi do
+defmodule Scrapper.Data.Api.MatchApi do
   @match_base_endpoint "https://europe.api.riotgames.com/lol/match/v5/matches/%{matchid}"
   @puuid_matches_base_endpoint "https://europe.api.riotgames.com/lol/match/v5/matches/by-puuid/%{puuid}/ids"
 
@@ -18,7 +18,7 @@ defmodule Scrapper.Data.MatchApi do
       200 ->
         # process the response here
         response.body
-        Poison.decode!(response.body, as: %Scrapper.Data.Model.Match.MatchResponse{})
+        Poison.decode!(response.body, as: %Scrapper.Data.Api.Model.Match.MatchResponse{})
 
       _ ->
         # handle error responses
diff --git a/apps/scrapper/lib/scrapper/data/model/match/match_response.ex b/apps/scrapper/lib/scrapper/data/model/match/match_response.ex
deleted file mode 100644
index 4dd0fe9..0000000
--- a/apps/scrapper/lib/scrapper/data/model/match/match_response.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-defmodule Scrapper.Data.Model.Match.MatchResponse do
-  alias Scrapper.Data.Model.Match.Info
-  alias Scrapper.Data.Model.Match.Metadata
-
-  defstruct metadata: %Metadata{},
-            info: %Info{}
-end