Reorganize package hierarchy

Revised the package structure to remove "common" packages designated for
future use, and to enhance the overall navigability of the project.

Change-Id: I2bcc92b78546bc7a5c81510739e1e1faa3915245
Signed-off-by: Patrizio <patrizio.gelosi@amarulasolutions.com>

src/main/java/com/googlesource/gerrit/plugins/chatgpt/PatchSetReviewer.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/PatchSetReviewer.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/PatchSetReviewer.java
index 6f2ab22..bb996d6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/PatchSetReviewer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/PatchSetReviewer.java
@@ -2,17 +2,17 @@
 
 import com.google.gson.Gson;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.chatgpt.client.DebugComment;
-import com.googlesource.gerrit.plugins.chatgpt.client.chatgpt.ChatGptClient;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClient;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClientReview;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.chatgpt.ChatGptClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClientReview;
+import com.googlesource.gerrit.plugins.chatgpt.client.messages.DebugMessages;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.comment.GerritCommentRange;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptReplyItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptResponseContent;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritCodeRange;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptReplyItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptResponseContent;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritCodeRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
 import com.googlesource.gerrit.plugins.chatgpt.model.review.ReviewBatch;
 import com.googlesource.gerrit.plugins.chatgpt.model.settings.Settings;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;
@@ -106,7 +106,7 @@
                 continue;
             }
             if (settings.getDebugMode()) {
-                reply += DebugComment.getDebugMessage(replyItem, isHidden);
+                reply += DebugMessages.getDebugMessage(replyItem, isHidden);
             }
             ReviewBatch batchMap = new ReviewBatch();
             batchMap.setContent(reply);

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientBase.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/common/ClientBase.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientBase.java
similarity index 78%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/common/ClientBase.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientBase.java
index 942657f..95f7025 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/common/ClientBase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientBase.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.common;
+package com.googlesource.gerrit.plugins.chatgpt.client;
 
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptClient.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptClient.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptClient.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptClient.java
index a6ae86e..8acfb5f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptClient.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.chatgpt;
 
 import com.google.common.net.HttpHeaders;
 import com.google.gson.Gson;
@@ -6,10 +6,10 @@
 import com.google.inject.Singleton;
 import com.googlesource.gerrit.plugins.chatgpt.client.HttpClientWithRetry;
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.client.prompt.ChatGptPrompt;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.*;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.*;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptParameters.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptParameters.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptParameters.java
similarity index 89%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptParameters.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptParameters.java
index 4343099..87ce4d6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptParameters.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptParameters.java
@@ -1,6 +1,6 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.chatgpt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.common.ClientBase;
+import com.googlesource.gerrit.plugins.chatgpt.client.ClientBase;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
 
 import java.util.concurrent.ThreadLocalRandom;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptTools.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptTools.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptTools.java
similarity index 80%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptTools.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptTools.java
index 69144ef..5006fff 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/chatgpt/ChatGptTools.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/chatgpt/ChatGptTools.java
@@ -1,7 +1,7 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.chatgpt;
 
 import com.google.gson.Gson;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptRequest;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptRequest;
 import com.googlesource.gerrit.plugins.chatgpt.utils.FileUtils;
 
 import java.io.IOException;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritChange.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritChange.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritChange.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritChange.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritChange.java
index d7d0d5a..8ebee44 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritChange.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritChange.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.gerrit.entities.BranchNameKey;
 import com.google.gerrit.entities.Change;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClient.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClient.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClient.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClient.java
index 2894121..8a6427e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClient.java
@@ -1,10 +1,10 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.inject.Singleton;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPermittedVotingRange;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPermittedVotingRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import com.googlesource.gerrit.plugins.chatgpt.utils.SingletonManager;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientAccount.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientAccount.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientAccount.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientAccount.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientAccount.java
index bb3f84a..dee1693 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientAccount.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientAccount.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.gson.JsonArray;
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientBase.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientBase.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientBase.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientBase.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientBase.java
index 3e2c505..ce21c39 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientBase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientBase.java
@@ -1,10 +1,10 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.common.net.HttpHeaders;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.googlesource.gerrit.plugins.chatgpt.client.common.ClientBase;
+import com.googlesource.gerrit.plugins.chatgpt.client.ClientBase;
 import com.googlesource.gerrit.plugins.chatgpt.client.HttpClientWithRetry;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientComments.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientComments.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientComments.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientComments.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientComments.java
index 6122029..c099579 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientComments.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientComments.java
@@ -1,12 +1,12 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.gerrit.server.events.CommentAddedEvent;
 import com.google.gson.reflect.TypeToken;
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;
-import com.googlesource.gerrit.plugins.chatgpt.client.common.ClientMessage;
+import com.googlesource.gerrit.plugins.chatgpt.client.messages.ClientMessage;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.CommentData;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.CommentData;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientDetail.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientDetail.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientDetail.java
similarity index 88%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientDetail.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientDetail.java
index 0fa118e..b59840a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientDetail.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientDetail.java
@@ -1,10 +1,10 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPatchSetDetail;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPermittedVotingRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPatchSetDetail;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPermittedVotingRange;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientFacade.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientFacade.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientFacade.java
similarity index 90%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientFacade.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientFacade.java
index f00c2f5..ae41055 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientFacade.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientFacade.java
@@ -1,9 +1,9 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPermittedVotingRange;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPermittedVotingRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientPatchSet.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientPatchSet.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientPatchSet.java
similarity index 95%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientPatchSet.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientPatchSet.java
index b8bae85..dce50dd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientPatchSet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientPatchSet.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -7,8 +7,8 @@
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPatchSetFileDiff;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritReviewFileDiff;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPatchSetFileDiff;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritReviewFileDiff;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientReview.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientReview.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientReview.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientReview.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientReview.java
index 9d5b461..0ebdbaa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/gerrit/GerritClientReview.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/api/gerrit/GerritClientReview.java
@@ -1,10 +1,10 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit;
 
 import com.google.common.net.HttpHeaders;
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritReview;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritReview;
 import com.googlesource.gerrit.plugins.chatgpt.model.review.ReviewBatch;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/commands/ClientCommands.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientCommands.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/commands/ClientCommands.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientCommands.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/commands/ClientCommands.java
index 6aab459..7b4cd8f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/ClientCommands.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/commands/ClientCommands.java
@@ -1,6 +1,6 @@
-package com.googlesource.gerrit.plugins.chatgpt.client;
+package com.googlesource.gerrit.plugins.chatgpt.client.commands;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.client.prompt.Directives;
 import com.googlesource.gerrit.plugins.chatgpt.model.settings.Settings;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/ClientMessage.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/common/ClientMessage.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/ClientMessage.java
similarity index 88%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/common/ClientMessage.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/ClientMessage.java
index 1841e12..c3b521f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/common/ClientMessage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/ClientMessage.java
@@ -1,8 +1,8 @@
-package com.googlesource.gerrit.plugins.chatgpt.client.common;
+package com.googlesource.gerrit.plugins.chatgpt.client.messages;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.ClientCommands;
-import com.googlesource.gerrit.plugins.chatgpt.client.DebugComment;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.ClientBase;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.commands.ClientCommands;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -60,7 +60,7 @@
     }
 
     public ClientMessage removeDebugMessages() {
-        message = DebugComment.removeDebugMessages(message);
+        message = DebugMessages.removeDebugMessages(message);
         return this;
     }
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/DebugMessages.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/DebugComment.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/DebugMessages.java
similarity index 85%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/DebugComment.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/DebugMessages.java
index b32bea8..08429e8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/DebugComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/messages/DebugMessages.java
@@ -1,6 +1,6 @@
-package com.googlesource.gerrit.plugins.chatgpt.client;
+package com.googlesource.gerrit.plugins.chatgpt.client.messages;
 
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptReplyItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptReplyItem;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;
@@ -8,7 +8,7 @@
 
 import static com.googlesource.gerrit.plugins.chatgpt.utils.TextUtils.*;
 
-public class DebugComment {
+public class DebugMessages {
     private static final String OPENING_TITLE = "DEBUGGING DETAILS";
     private static final String COMMENT_OPENING = CODE_DELIMITER_BEGIN + OPENING_TITLE + "\n";
     private static final String HIDDEN_REPLY = "hidden: %s";

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/CodeFinder.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/CodeFinder.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/CodeFinder.java
index 1e969a1..00349e7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/CodeFinder.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/CodeFinder.java
@@ -1,7 +1,7 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.patch.code;
 
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptReplyItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritCodeRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptReplyItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritCodeRange;
 import com.googlesource.gerrit.plugins.chatgpt.model.patch.code.CodeFinderDiff;
 import com.googlesource.gerrit.plugins.chatgpt.model.patch.diff.DiffContent;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/InlineCode.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/InlineCode.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/InlineCode.java
index 25f556b..349b474 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/InlineCode.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/code/InlineCode.java
@@ -1,9 +1,9 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.patch.code;
 
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptReplyItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritCodeRange;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptReplyItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritCodeRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/comment/GerritCommentRange.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/comment/GerritCommentRange.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/comment/GerritCommentRange.java
index c3b1cec..d66f4b7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/comment/GerritCommentRange.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/comment/GerritCommentRange.java
@@ -1,11 +1,11 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.patch.comment;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClient;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.code.InlineCode;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptReplyItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritCodeRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptReplyItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritCodeRange;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/diff/FileDiffProcessed.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/diff/FileDiffProcessed.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/diff/FileDiffProcessed.java
index 70f725b..fe14a82 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/diff/FileDiffProcessed.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/patch/diff/FileDiffProcessed.java
@@ -1,6 +1,6 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.patch.diff;
 
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPatchSetFileDiff;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPatchSetFileDiff;
 import com.googlesource.gerrit.plugins.chatgpt.model.patch.code.CodeFinderDiff;
 import com.googlesource.gerrit.plugins.chatgpt.model.patch.diff.DiffContent;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptComment.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptComment.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptComment.java
index 33a5e20..3618f76 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptComment.java
@@ -1,10 +1,10 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.common.ClientBase;
-import com.googlesource.gerrit.plugins.chatgpt.client.common.ClientMessage;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.ClientBase;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.messages.ClientMessage;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptHistory.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptHistory.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptHistory.java
index 6811b4a..a56c853 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptHistory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptHistory.java
@@ -1,11 +1,11 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptRequestMessage;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.CommentData;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptRequestMessage;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.CommentData;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import com.googlesource.gerrit.plugins.chatgpt.settings.StaticSettings;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPrompt.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPrompt.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPrompt.java
index 948bb40..ce7df88 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPrompt.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPrompt.java
@@ -1,10 +1,10 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
 import com.google.gson.Gson;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptMessageItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptMessageItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptBase.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptBase.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptBase.java
index b2d71ee..d227eec 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptBase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptBase.java
@@ -1,14 +1,14 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.code.InlineCode;
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptMessageItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptRequestMessage;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.CommentData;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptMessageItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptRequestMessage;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.CommentData;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptRequests.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptRequests.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptRequests.java
index bb1f0c5..8a2b6ef 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptRequests.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptRequests.java
@@ -1,10 +1,10 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptMessageItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptRequestMessage;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptMessageItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptRequestMessage;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptReview.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptReview.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptReview.java
index 71557b3..7eaa5dc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptReview.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/ChatGptUserPromptReview.java
@@ -1,10 +1,10 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptMessageItem;
-import com.googlesource.gerrit.plugins.chatgpt.model.chatgpt.ChatGptRequestMessage;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptMessageItem;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt.ChatGptRequestMessage;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/Directives.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/Directives.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/Directives.java
index 1a8e30f..4eb3e0b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/Directives.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/client/prompt/Directives.java
@@ -1,6 +1,6 @@
 package com.googlesource.gerrit.plugins.chatgpt.client.prompt;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 import com.googlesource.gerrit.plugins.chatgpt.model.settings.Settings;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/listener/EventListenerHandler.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/listener/EventListenerHandler.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/listener/EventListenerHandler.java
index d20ccc6..b7256b8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/listener/EventListenerHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/listener/EventListenerHandler.java
@@ -8,8 +8,8 @@
 import com.google.gerrit.server.events.Event;
 import com.google.inject.Inject;
 import com.googlesource.gerrit.plugins.chatgpt.PatchSetReviewer;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClient;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
 import com.googlesource.gerrit.plugins.chatgpt.model.settings.Settings;
 import com.googlesource.gerrit.plugins.chatgpt.settings.DynamicSettings;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptDialogueItem.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptDialogueItem.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptDialogueItem.java
similarity index 74%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptDialogueItem.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptDialogueItem.java
index 96e6087..b48df46 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptDialogueItem.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptDialogueItem.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptMessageItem.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptMessageItem.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptMessageItem.java
similarity index 79%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptMessageItem.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptMessageItem.java
index 6ece5fc..ca3b1d3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptMessageItem.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptMessageItem.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptReplyItem.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptReplyItem.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptReplyItem.java
similarity index 81%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptReplyItem.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptReplyItem.java
index bf19490..1589b47 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptReplyItem.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptReplyItem.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequest.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptRequest.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequest.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptRequest.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequest.java
index bfe1390..926d52c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptRequest.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequest.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Builder;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequestMessage.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptRequestMessage.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequestMessage.java
similarity index 77%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptRequestMessage.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequestMessage.java
index 2ddfb07..031d90d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptRequestMessage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptRequestMessage.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseContent.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseContent.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseContent.java
similarity index 71%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseContent.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseContent.java
index e7a2f78..1401d61 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseContent.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseContent.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseMessage.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseMessage.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseMessage.java
similarity index 78%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseMessage.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseMessage.java
index 2ec66bc..5426fe7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseMessage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseMessage.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseStreamed.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseStreamed.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseStreamed.java
similarity index 85%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseStreamed.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseStreamed.java
index 65863db..2e0ad25 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseStreamed.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseStreamed.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseUnstreamed.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseUnstreamed.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseUnstreamed.java
similarity index 78%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseUnstreamed.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseUnstreamed.java
index efe6e60..5d050a0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptResponseUnstreamed.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptResponseUnstreamed.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptToolCall.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptToolCall.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptToolCall.java
similarity index 79%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptToolCall.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptToolCall.java
index e8849c0..5651c82 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/chatgpt/ChatGptToolCall.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/chatgpt/ChatGptToolCall.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.chatgpt;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.chatgpt;
 
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritCodeRange.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritCodeRange.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritCodeRange.java
similarity index 86%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritCodeRange.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritCodeRange.java
index 125ccba..01c93a4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritCodeRange.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritCodeRange.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Builder;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritComment.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritComment.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritComment.java
similarity index 95%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritComment.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritComment.java
index 6ca3f11..c92a98f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritComment.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import com.google.gson.annotations.SerializedName;
 import com.googlesource.gerrit.plugins.chatgpt.settings.StaticSettings;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritFileDiff.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritFileDiff.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritFileDiff.java
similarity index 84%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritFileDiff.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritFileDiff.java
index d6f7763..89144c1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritFileDiff.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritFileDiff.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetDetail.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPatchSetDetail.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetDetail.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPatchSetDetail.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetDetail.java
index c2d13e1..f420b23 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPatchSetDetail.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetDetail.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetFileDiff.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPatchSetFileDiff.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetFileDiff.java
similarity index 84%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPatchSetFileDiff.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetFileDiff.java
index 7b42809..c8fb714 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPatchSetFileDiff.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPatchSetFileDiff.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPermittedVotingRange.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPermittedVotingRange.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPermittedVotingRange.java
similarity index 63%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPermittedVotingRange.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPermittedVotingRange.java
index c2622ff..dd6de9c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritPermittedVotingRange.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritPermittedVotingRange.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReview.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritReview.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReview.java
similarity index 86%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritReview.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReview.java
index af9a240..cd42609 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritReview.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReview.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReviewFileDiff.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritReviewFileDiff.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReviewFileDiff.java
similarity index 86%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritReviewFileDiff.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReviewFileDiff.java
index 1e3e87b..186c30a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/gerrit/GerritReviewFileDiff.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/api/gerrit/GerritReviewFileDiff.java
@@ -1,4 +1,4 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.gerrit;
+package com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit;
 
 import com.googlesource.gerrit.plugins.chatgpt.model.patch.diff.DiffContent;
 import lombok.Data;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/CommentData.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/common/CommentData.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/CommentData.java
similarity index 70%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/common/CommentData.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/CommentData.java
index 7ab0cef..e4ce66e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/common/CommentData.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/CommentData.java
@@ -1,6 +1,6 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.common;
+package com.googlesource.gerrit.plugins.chatgpt.model.data;
 
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/GerritClientData.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/common/GerritClientData.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/GerritClientData.java
similarity index 81%
rename from src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/common/GerritClientData.java
rename to src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/GerritClientData.java
index 29c792b..aa2ea98 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/common/GerritClientData.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/data/GerritClientData.java
@@ -1,7 +1,7 @@
-package com.googlesource.gerrit.plugins.chatgpt.model.common;
+package com.googlesource.gerrit.plugins.chatgpt.model.data;
 
 import com.googlesource.gerrit.plugins.chatgpt.client.patch.diff.FileDiffProcessed;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritComment;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritComment;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/review/ReviewBatch.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/review/ReviewBatch.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/review/ReviewBatch.java
index c4761ca..324ec7f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/review/ReviewBatch.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/model/review/ReviewBatch.java
@@ -1,6 +1,6 @@
 package com.googlesource.gerrit.plugins.chatgpt.model.review;
 
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritCodeRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritCodeRange;
 import lombok.Data;
 
 import static com.googlesource.gerrit.plugins.chatgpt.settings.StaticSettings.GERRIT_PATCH_SET_FILENAME;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/settings/DynamicSettings.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/settings/DynamicSettings.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/settings/DynamicSettings.java
index cfe8140..3b0ce66 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/settings/DynamicSettings.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/settings/DynamicSettings.java
@@ -1,11 +1,11 @@
 package com.googlesource.gerrit.plugins.chatgpt.settings;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClient;
 import com.googlesource.gerrit.plugins.chatgpt.client.prompt.ChatGptUserPrompt;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
-import com.googlesource.gerrit.plugins.chatgpt.model.common.GerritClientData;
-import com.googlesource.gerrit.plugins.chatgpt.model.gerrit.GerritPermittedVotingRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.api.gerrit.GerritPermittedVotingRange;
+import com.googlesource.gerrit.plugins.chatgpt.model.data.GerritClientData;
 import com.googlesource.gerrit.plugins.chatgpt.model.settings.Settings;
 import com.googlesource.gerrit.plugins.chatgpt.utils.SingletonManager;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/googlesource/gerrit/plugins/chatgpt/utils/SingletonManager.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/utils/SingletonManager.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/utils/SingletonManager.java
index 64351f7..cef0b7f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/utils/SingletonManager.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/utils/SingletonManager.java
@@ -1,6 +1,6 @@
 package com.googlesource.gerrit.plugins.chatgpt.utils;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
 
 import java.util.HashMap;
 import java.util.Map;

src/test/java/com/googlesource/gerrit/plugins/chatgpt/ChatGptReviewTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/chatgpt/ChatGptReviewTest.java b/src/test/java/com/googlesource/gerrit/plugins/chatgpt/ChatGptReviewTest.java
index d844741..99156c5 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/chatgpt/ChatGptReviewTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/chatgpt/ChatGptReviewTest.java
@@ -17,10 +17,10 @@
 import com.google.gson.JsonArray;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritChange;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClient;
-import com.googlesource.gerrit.plugins.chatgpt.client.chatgpt.ChatGptClient;
 import com.googlesource.gerrit.plugins.chatgpt.client.UriResourceLocator;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritChange;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.chatgpt.ChatGptClient;
 import com.googlesource.gerrit.plugins.chatgpt.client.prompt.ChatGptPrompt;
 import com.googlesource.gerrit.plugins.chatgpt.config.ConfigCreator;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;

src/test/java/com/googlesource/gerrit/plugins/chatgpt/integration/CodeReviewPluginIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/chatgpt/integration/CodeReviewPluginIT.java b/src/test/java/com/googlesource/gerrit/plugins/chatgpt/integration/CodeReviewPluginIT.java
index 27643ff..f58aee1 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/chatgpt/integration/CodeReviewPluginIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/chatgpt/integration/CodeReviewPluginIT.java
@@ -1,8 +1,8 @@
 package com.googlesource.gerrit.plugins.chatgpt.integration;
 
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClient;
-import com.googlesource.gerrit.plugins.chatgpt.client.chatgpt.ChatGptClient;
-import com.googlesource.gerrit.plugins.chatgpt.client.gerrit.GerritClientReview;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.chatgpt.ChatGptClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClient;
+import com.googlesource.gerrit.plugins.chatgpt.client.api.gerrit.GerritClientReview;
 import com.googlesource.gerrit.plugins.chatgpt.client.prompt.ChatGptPrompt;
 import com.googlesource.gerrit.plugins.chatgpt.config.Configuration;
 import com.googlesource.gerrit.plugins.chatgpt.model.review.ReviewBatch;