diff --git a/src/main/java/de/extio/lmlib/client/oai/textcompletion/Choice.java b/src/main/java/de/extio/lmlib/client/oai/completion/Choice.java
similarity index 93%
rename from src/main/java/de/extio/lmlib/client/oai/textcompletion/Choice.java
rename to src/main/java/de/extio/lmlib/client/oai/completion/Choice.java
index 489d612..0683ac2 100755
--- a/src/main/java/de/extio/lmlib/client/oai/textcompletion/Choice.java
+++ b/src/main/java/de/extio/lmlib/client/oai/completion/Choice.java
@@ -1,8 +1,8 @@
-package de.extio.lmlib.client.oai.textcompletion;
+package de.extio.lmlib.client.oai.completion;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public final class Choice {
+final class Choice {
 	
 	public static final String FINISH_REASON_STOP = "stop";
 	
diff --git a/src/main/java/de/extio/lmlib/client/oai/textcompletion/CompletionRequest.java b/src/main/java/de/extio/lmlib/client/oai/completion/CompletionRequest.java
similarity index 93%
rename from src/main/java/de/extio/lmlib/client/oai/textcompletion/CompletionRequest.java
rename to src/main/java/de/extio/lmlib/client/oai/completion/CompletionRequest.java
index 4c05fab..b9fd80d 100755
--- a/src/main/java/de/extio/lmlib/client/oai/textcompletion/CompletionRequest.java
+++ b/src/main/java/de/extio/lmlib/client/oai/completion/CompletionRequest.java
@@ -1,8 +1,8 @@
-package de.extio.lmlib.client.oai.textcompletion;
+package de.extio.lmlib.client.oai.completion;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public final class CompletionRequest {
+final class CompletionRequest {
 	
 	private String model;
 	
diff --git a/src/main/java/de/extio/lmlib/client/oai/textcompletion/CompletionResponse.java b/src/main/java/de/extio/lmlib/client/oai/completion/CompletionResponse.java
similarity index 95%
rename from src/main/java/de/extio/lmlib/client/oai/textcompletion/CompletionResponse.java
rename to src/main/java/de/extio/lmlib/client/oai/completion/CompletionResponse.java
index e659d3b..c8f2683 100755
--- a/src/main/java/de/extio/lmlib/client/oai/textcompletion/CompletionResponse.java
+++ b/src/main/java/de/extio/lmlib/client/oai/completion/CompletionResponse.java
@@ -1,10 +1,10 @@
-package de.extio.lmlib.client.oai.textcompletion;
+package de.extio.lmlib.client.oai.completion;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public final class CompletionResponse {
+final class CompletionResponse {
 	
 	private String id;
 	
diff --git a/src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java b/src/main/java/de/extio/lmlib/client/oai/completion/TextCompletionClient.java
similarity index 99%
rename from src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java
rename to src/main/java/de/extio/lmlib/client/oai/completion/TextCompletionClient.java
index e1a4234..c00d94e 100755
--- a/src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java
+++ b/src/main/java/de/extio/lmlib/client/oai/completion/TextCompletionClient.java
@@ -1,4 +1,4 @@
-package de.extio.lmlib.client.oai.textcompletion;
+package de.extio.lmlib.client.oai.completion;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
diff --git a/src/main/java/de/extio/lmlib/client/oai/textcompletion/Usage.java b/src/main/java/de/extio/lmlib/client/oai/completion/Usage.java
similarity index 93%
rename from src/main/java/de/extio/lmlib/client/oai/textcompletion/Usage.java
rename to src/main/java/de/extio/lmlib/client/oai/completion/Usage.java
index f7f48df..0aa4b65 100644
--- a/src/main/java/de/extio/lmlib/client/oai/textcompletion/Usage.java
+++ b/src/main/java/de/extio/lmlib/client/oai/completion/Usage.java
@@ -1,8 +1,8 @@
-package de.extio.lmlib.client.oai.textcompletion;
+package de.extio.lmlib.client.oai.completion;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public final class Usage {
+final class Usage {
     
     private int completionTokens;
     
diff --git a/src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java b/src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java
index e05d5b9..41bafa6 100755
--- a/src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java
+++ b/src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java
@@ -21,11 +21,11 @@ import org.springframework.context.annotation.PropertySource;
 import de.extio.lmlib.client.Conversation;
 import de.extio.lmlib.client.Conversation.Turn;
 import de.extio.lmlib.client.Conversation.TurnType;
-import de.extio.lmlib.client.oai.textcompletion.TextCompletionClient;
+import de.extio.lmlib.client.oai.completion.TextCompletionClient;
 import de.extio.lmlib.grader.Grader;
 import de.extio.lmlib.profile.ModelCategory;
 
-@Disabled("This test requires a running Llama server")
+//@Disabled("This test requires a running Llama server")
 @SpringBootTest(webEnvironment = WebEnvironment.NONE)
 @SpringBootConfiguration
 @ComponentScan(basePackages = "de.extio.lmlib")