Connected APIs with new models.

pom.xml

@@ -60,7 +60,7 @@
 
     <groupId>net.andrewcpu</groupId>
     <artifactId>elevenlabs-api</artifactId>
-    <version>2.2</version>
+    <version>2.5-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

src/main/java/net/andrewcpu/elevenlabs/ElevenLabs.java

@@ -1,38 +1,18 @@
 package net.andrewcpu.elevenlabs;
 
-import net.andrewcpu.elevenlabs.enums.GeneratedAudioOutputFormat;
-import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
-import net.andrewcpu.elevenlabs.model.history.History;
-import net.andrewcpu.elevenlabs.model.history.HistoryItem;
-import net.andrewcpu.elevenlabs.model.projects.Project;
-import net.andrewcpu.elevenlabs.model.request.TextToSpeechRequest;
-import net.andrewcpu.elevenlabs.model.response.CreateVoiceResponse;
-import net.andrewcpu.elevenlabs.model.response.GenerationTypeModel;
-import net.andrewcpu.elevenlabs.model.response.ProjectsModelResponse;
-import net.andrewcpu.elevenlabs.model.user.Subscription;
-import net.andrewcpu.elevenlabs.model.user.User;
-import net.andrewcpu.elevenlabs.model.voice.Voice;
-import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
-import net.andrewcpu.elevenlabs.requests.ElevenLabsRequest;
-import net.andrewcpu.elevenlabs.requests.history.*;
-import net.andrewcpu.elevenlabs.requests.models.GetModelsRequest;
-import net.andrewcpu.elevenlabs.requests.projects.GetProjectsRequest;
-import net.andrewcpu.elevenlabs.requests.samples.DeleteSampleRequest;
-import net.andrewcpu.elevenlabs.requests.samples.GetSampleRequest;
-import net.andrewcpu.elevenlabs.requests.tts.PostTextToSpeechRequest;
-import net.andrewcpu.elevenlabs.requests.tts.PostTextToSpeechStreamedRequest;
-import net.andrewcpu.elevenlabs.requests.user.GetSubscriptionRequest;
-import net.andrewcpu.elevenlabs.requests.user.GetUserRequest;
-import net.andrewcpu.elevenlabs.requests.voices.*;
-import net.andrewcpu.elevenlabs.util.ElevenNetworkUtil;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
+import net.andrewcpu.elevenlabs.api.impl.*;
 
 public class ElevenLabs {
 	private static String API_KEY = null;
+	private static HistoryAPI historyAPI;
+	private static ModelsAPI modelsAPI;
+	private static ProjectsAPI projectsAPI;
+	private static SampleAPI sampleAPI;
+	private static SpeechToSpeechAPI speechToSpeechAPI;
+	private static TextToSpeechAPI textToSpeechAPI;
+	private static UserAPI userAPI;
+	private static VoiceAPI voiceAPI;
+	private static AudioNativeAPI audioNativeAPI;
 
 	public static String getApiKey() {
 		return API_KEY;
@@ -40,103 +20,54 @@ public class ElevenLabs {
 
 	public static void setApiKey(String apiKey) {
 		API_KEY = apiKey;
+		initializeSubclasses();
 	}
 
-	private static <T> T sendRequest(ElevenLabsRequest<T> request) {
-		return ElevenNetworkUtil.sendRequest(request.getType(),request.getEndpoint(), request.getPayload(),request.getResponseClass());
+	private static void initializeSubclasses() {
+		ElevenLabs.historyAPI = new HistoryAPI();
+		ElevenLabs.modelsAPI = new ModelsAPI();
+		ElevenLabs.projectsAPI = new ProjectsAPI();
+		ElevenLabs.sampleAPI = new SampleAPI();
+		ElevenLabs.speechToSpeechAPI = new SpeechToSpeechAPI();
+		ElevenLabs.textToSpeechAPI = new TextToSpeechAPI();
+		ElevenLabs.userAPI = new UserAPI();
+		ElevenLabs.voiceAPI = new VoiceAPI();
+		ElevenLabs.audioNativeAPI = new AudioNativeAPI();
 	}
 
-	public static History getHistory() {
-		return sendRequest(new GetHistoryRequest());
+	public static AudioNativeAPI getAudioNativeAPI() {
+		return audioNativeAPI;
 	}
 
-	public static User getUser() {
-		return sendRequest(new GetUserRequest());
+	public static HistoryAPI getHistoryAPI() {
+		return historyAPI;
 	}
 
-	public static Subscription getSubscription() {
-		return sendRequest(new GetSubscriptionRequest());
+	public static ModelsAPI getModelsAPI() {
+		return modelsAPI;
 	}
 
-	public static HistoryItem getHistoryItem(String historyItemId) {
-		return sendRequest(new GetHistoryItemByIdRequest(historyItemId));
+	public static ProjectsAPI getProjectsAPI() {
+		return projectsAPI;
 	}
 
-	public static String deleteHistoryItem(String historyItemId) {
-		return sendRequest(new DeleteHistoryItemRequest(historyItemId));
+	public static SampleAPI getSampleAPI() {
+		return sampleAPI;
 	}
 
-	public static File getHistoryItemAudio(String historyItemId) {
-		return sendRequest(new GetHistoryItemAudioRequest(historyItemId));
+	public static SpeechToSpeechAPI getSpeechToSpeechAPI() {
+		return speechToSpeechAPI;
 	}
 
-	public static File getHistoryItemAudio(String... historyItemIds) {
-		return sendRequest(new PostDownloadHistoryItemsRequest(historyItemIds));
+	public static TextToSpeechAPI getTextToSpeechAPI() {
+		return textToSpeechAPI;
 	}
 
-	public static String deleteSample(String voiceId, String sampleId) {
-		return sendRequest(new DeleteSampleRequest(voiceId, sampleId));
+	public static UserAPI getUserAPI() {
+		return userAPI;
 	}
 
-	public static File getAudioSample(String voiceId, String sampleId) {
-		return sendRequest(new GetSampleRequest(voiceId, sampleId));
-	}
-
-	public static List<Voice> getVoices() {
-		return sendRequest(new GetVoicesRequest()).getVoices();
-	}
-
-	public static VoiceSettings getDefaultVoiceSettings() {
-		return sendRequest(new GetDefaultVoiceSettingsRequest());
-	}
-
-	public static VoiceSettings getVoiceSettings(String voiceId) {
-		return sendRequest(new GetVoiceSettingsRequest(voiceId));
-	}
-
-	public static Voice getVoice(String voiceId) {
-		return sendRequest(new GetVoiceRequest(voiceId));
-	}
-
-	public static Voice getVoice(String voiceId, boolean withSettings) {
-		return sendRequest(new GetVoiceRequest(voiceId, withSettings));
-	}
-
-	public static ProjectsModelResponse getProjects() {
-		return sendRequest(new GetProjectsRequest());
-	}
-
-	public static String deleteVoice(String voiceId) {
-		return sendRequest(new DeleteVoiceRequest(voiceId));
-	}
-
-	public static String editVoiceSettings(String voiceId, VoiceSettings settings) {
-		return sendRequest(new PostEditVoiceSettingsRequest(voiceId, settings));
-	}
-
-	public static CreateVoiceResponse createVoice(String name, File[] files, String description, Map<String, String> labels) {
-		return sendRequest(new PostAddVoiceRequest(name, files, description, labels));
-	}
-	public static String editVoice(String voiceId, String name, File[] files, String description, Map<String, String> labels) {
-		return sendRequest(new PostEditVoiceRequest(voiceId, name, files, description, labels));
-	}
-
-	public static GenerationTypeModel[] getAvailableModels() {
-		return sendRequest(new GetModelsRequest());
-	}
-
-	public static File generateTextToSpeech(String voiceId, String text, String modelId, VoiceSettings voiceSettings) {
-		return sendRequest(new PostTextToSpeechRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings)));
-	}
-
-	public static File generateTextToSpeech(String voiceId, String text, String modelId, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization, VoiceSettings voiceSettings) {
-		return sendRequest(new PostTextToSpeechRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings), streamLatencyOptimization, outputFormat));
-	}
-	public static InputStream generateTextToSpeechStreamed(String voiceId, String text, String modelId, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization, VoiceSettings voiceSettings) {
-		return sendRequest(new PostTextToSpeechStreamedRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings), streamLatencyOptimization, outputFormat));
-	}
-
-	public static InputStream generateTextToSpeechStreamed(String voiceId, String text, String modelId, VoiceSettings voiceSettings) {
-		return sendRequest(new PostTextToSpeechStreamedRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings)));
+	public static VoiceAPI getVoiceAPI() {
+		return voiceAPI;
 	}
 }

src/main/java/net/andrewcpu/elevenlabs/api/ElevenLabsAPI.java

@@ -0,0 +1,13 @@
+package net.andrewcpu.elevenlabs.api;
+
+import net.andrewcpu.elevenlabs.requests.ElevenLabsRequest;
+import net.andrewcpu.elevenlabs.util.ElevenNetworkUtil;
+
+public abstract class ElevenLabsAPI {
+	public ElevenLabsAPI() {
+	}
+
+	protected  <T> T sendRequest(ElevenLabsRequest<T> request) {
+		return ElevenNetworkUtil.sendRequest(request.getType(),request.getEndpoint(), request.getPayload(),request.getResponseClass());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/AudioNativeAPI.java

@@ -0,0 +1,12 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.model.request.CreateAudioNativeProjectRequest;
+import net.andrewcpu.elevenlabs.model.response.CreateAudioEnabledProjectModelResponse;
+import net.andrewcpu.elevenlabs.requests.audionative.PostCreateAudioNativeProjectRequest;
+
+public class AudioNativeAPI extends ElevenLabsAPI {
+	public CreateAudioEnabledProjectModelResponse createAudioEnabledProject(CreateAudioNativeProjectRequest request) {
+		return sendRequest(new PostCreateAudioNativeProjectRequest(request));
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/HistoryAPI.java

@@ -0,0 +1,31 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.model.history.History;
+import net.andrewcpu.elevenlabs.model.history.HistoryItem;
+import net.andrewcpu.elevenlabs.requests.history.*;
+
+import java.io.File;
+
+public class HistoryAPI extends ElevenLabsAPI {
+
+	public History getHistory() {
+		return sendRequest(new GetHistoryRequest());
+	}
+
+	public HistoryItem getHistoryItem(String historyItemId) {
+		return sendRequest(new GetHistoryItemByIdRequest(historyItemId));
+	}
+
+	public String deleteHistoryItem(String historyItemId) {
+		return sendRequest(new DeleteHistoryItemRequest(historyItemId));
+	}
+
+	public File getHistoryItemAudio(String historyItemId) {
+		return sendRequest(new GetHistoryItemAudioRequest(historyItemId));
+	}
+
+	public File getHistoryItemAudio(String... historyItemIds) {
+		return sendRequest(new PostDownloadHistoryItemsRequest(historyItemIds));
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/ModelsAPI.java

@@ -0,0 +1,12 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.model.response.GenerationTypeModel;
+import net.andrewcpu.elevenlabs.requests.models.GetModelsRequest;
+
+public class ModelsAPI extends ElevenLabsAPI {
+
+	public GenerationTypeModel[] getAvailableModels() {
+		return sendRequest(new GetModelsRequest());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/ProjectsAPI.java

@@ -0,0 +1,67 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.model.projects.Chapter;
+import net.andrewcpu.elevenlabs.model.projects.ChapterSnapshot;
+import net.andrewcpu.elevenlabs.model.projects.Project;
+import net.andrewcpu.elevenlabs.model.projects.ProjectSnapshot;
+import net.andrewcpu.elevenlabs.model.request.AddProjectRequest;
+import net.andrewcpu.elevenlabs.requests.projects.*;
+
+import java.io.InputStream;
+import java.util.List;
+
+public class ProjectsAPI extends ElevenLabsAPI {
+	public List<Project> getProjects() {
+		return sendRequest(new GetProjectsRequest()).getProjects();
+	}
+
+	public Project addProject(AddProjectRequest addProjectRequest) {
+		return sendRequest(new PostAddProjectRequest(addProjectRequest)).getProject();
+	}
+
+	public Project getProject(String id) {
+		return sendRequest(new GetProjectByIdRequest(id));
+	}
+
+	public String deleteProject(String projectId) {
+		return sendRequest(new DeleteProjectByIdRequest(projectId));
+	}
+
+	public String convertProject(String projectId) {
+		return sendRequest(new PostConvertProjectRequest(projectId));
+	}
+
+	public List<ProjectSnapshot> getProjectSnapshots(String projectId) {
+		return sendRequest(new GetProjectSnapshotsRequest(projectId)).getSnapshots();
+	}
+
+	public InputStream getProjectSnapshotAudioStream(String projectId, String projectSnapshotId) {
+		return sendRequest(new PostStreamProjectSnapshotAudioRequest(projectId, projectSnapshotId));
+	}
+
+	public List<Chapter> getChapters(String projectId) {
+		return sendRequest(new GetProjectChaptersRequest(projectId)).getChapters();
+	}
+
+	public Chapter getChapterById(String projectId, String chapterId) {
+		return sendRequest(new GetChapterByIdRequest(projectId, chapterId));
+	}
+
+	public String deleteChapter(String projectId, String chapterId) {
+		return sendRequest(new DeleteChapterByIdRequest(projectId, chapterId));
+	}
+
+	public String convertChapter(String projectId, String chapterId) {
+		return sendRequest(new PostConvertChapterRequest(projectId, chapterId));
+	}
+
+	public List<ChapterSnapshot> getChapterSnapshots(String projectId, String chapterId) {
+		return sendRequest(new GetChapterSnapshotsRequest(projectId, chapterId)).getSnapshots();
+	}
+
+	public InputStream getChapterSnapshotAudioStream(String projectId, String chapterId, String chapterSnapshotId) {
+		return sendRequest(new PostStreamChapterSnapshotAudioRequest(projectId, chapterId, chapterSnapshotId));
+	}
+
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/SampleAPI.java

@@ -0,0 +1,18 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.requests.samples.DeleteSampleRequest;
+import net.andrewcpu.elevenlabs.requests.samples.GetSampleRequest;
+
+import java.io.File;
+
+public class SampleAPI extends ElevenLabsAPI {
+
+	public String deleteSample(String voiceId, String sampleId) {
+		return sendRequest(new DeleteSampleRequest(voiceId, sampleId));
+	}
+
+	public File getAudioSample(String voiceId, String sampleId) {
+		return sendRequest(new GetSampleRequest(voiceId, sampleId));
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/SpeechToSpeechAPI.java

@@ -0,0 +1,28 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
+import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
+import net.andrewcpu.elevenlabs.requests.sts.PostSpeechToSpeechRequest;
+import net.andrewcpu.elevenlabs.requests.sts.PostSpeechToSpeechStreamedRequest;
+
+import java.io.File;
+import java.io.InputStream;
+
+public class SpeechToSpeechAPI extends ElevenLabsAPI {
+	public File generateSpeechToSpeech(String voiceId, VoiceSettings voiceSettings, String modelId, File audio) {
+		return generateSpeechToSpeech(voiceId, voiceSettings, modelId, audio, StreamLatencyOptimization.getDefault());
+	}
+
+	public File generateSpeechToSpeech(String voiceId, VoiceSettings voiceSettings, String modelId, File audio, StreamLatencyOptimization latencyOptimization) {
+		return sendRequest(new PostSpeechToSpeechRequest(voiceId, voiceSettings,audio, modelId, latencyOptimization));
+	}
+
+	public InputStream generateSpeechToSpeechStream(String voiceId, VoiceSettings voiceSettings, String modelId, File audio, StreamLatencyOptimization streamLatencyOptimization) {
+		return sendRequest(new PostSpeechToSpeechStreamedRequest(voiceId, voiceSettings, audio, modelId, streamLatencyOptimization));
+	}
+
+	public InputStream generateSpeechToSpeechStream(String voiceId, VoiceSettings voiceSettings, String modelId, File audio) {
+		return generateSpeechToSpeechStream(voiceId, voiceSettings, modelId, audio, StreamLatencyOptimization.getDefault());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/TextToSpeechAPI.java

@@ -0,0 +1,31 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.enums.GeneratedAudioOutputFormat;
+import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
+import net.andrewcpu.elevenlabs.model.request.TextToSpeechRequest;
+import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
+import net.andrewcpu.elevenlabs.requests.tts.PostTextToSpeechRequest;
+import net.andrewcpu.elevenlabs.requests.tts.PostTextToSpeechStreamedRequest;
+
+import java.io.File;
+import java.io.InputStream;
+
+public class TextToSpeechAPI extends ElevenLabsAPI {
+
+	public File generateTextToSpeech(String voiceId, String text, String modelId, VoiceSettings voiceSettings) {
+		return sendRequest(new PostTextToSpeechRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings)));
+	}
+
+	public File generateTextToSpeech(String voiceId, String text, String modelId, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization, VoiceSettings voiceSettings) {
+		return sendRequest(new PostTextToSpeechRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings), streamLatencyOptimization, outputFormat));
+	}
+	public InputStream generateTextToSpeechStreamed(String voiceId, String text, String modelId, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization, VoiceSettings voiceSettings) {
+		return sendRequest(new PostTextToSpeechStreamedRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings), streamLatencyOptimization, outputFormat));
+	}
+
+	public InputStream generateTextToSpeechStreamed(String voiceId, String text, String modelId, VoiceSettings voiceSettings) {
+		return sendRequest(new PostTextToSpeechStreamedRequest(voiceId, new TextToSpeechRequest(text, modelId, voiceSettings)));
+	}
+
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/UserAPI.java

@@ -0,0 +1,19 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.model.user.Subscription;
+import net.andrewcpu.elevenlabs.model.user.User;
+import net.andrewcpu.elevenlabs.requests.user.GetSubscriptionRequest;
+import net.andrewcpu.elevenlabs.requests.user.GetUserRequest;
+
+public class UserAPI extends ElevenLabsAPI {
+
+
+	public User getUser() {
+		return sendRequest(new GetUserRequest());
+	}
+
+	public Subscription getSubscription() {
+		return sendRequest(new GetSubscriptionRequest());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/api/impl/VoiceAPI.java

@@ -0,0 +1,55 @@
+package net.andrewcpu.elevenlabs.api.impl;
+
+import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.model.response.CreateVoiceResponse;
+import net.andrewcpu.elevenlabs.model.response.ProjectsModelResponse;
+import net.andrewcpu.elevenlabs.model.voice.Voice;
+import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
+import net.andrewcpu.elevenlabs.requests.projects.GetProjectsRequest;
+import net.andrewcpu.elevenlabs.requests.voices.*;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+public class VoiceAPI extends ElevenLabsAPI {
+
+	public List<Voice> getVoices() {
+		return sendRequest(new GetVoicesRequest()).getVoices();
+	}
+
+	public VoiceSettings getDefaultVoiceSettings() {
+		return sendRequest(new GetDefaultVoiceSettingsRequest());
+	}
+
+	public VoiceSettings getVoiceSettings(String voiceId) {
+		return sendRequest(new GetVoiceSettingsRequest(voiceId));
+	}
+
+	public Voice getVoice(String voiceId) {
+		return sendRequest(new GetVoiceRequest(voiceId));
+	}
+
+	public Voice getVoice(String voiceId, boolean withSettings) {
+		return sendRequest(new GetVoiceRequest(voiceId, withSettings));
+	}
+
+	public ProjectsModelResponse getProjects() {
+		return sendRequest(new GetProjectsRequest());
+	}
+
+	public String deleteVoice(String voiceId) {
+		return sendRequest(new DeleteVoiceRequest(voiceId));
+	}
+
+	public String editVoiceSettings(String voiceId, VoiceSettings settings) {
+		return sendRequest(new PostEditVoiceSettingsRequest(voiceId, settings));
+	}
+
+	public CreateVoiceResponse createVoice(String name, File[] files, String description, Map<String, String> labels) {
+		return sendRequest(new PostAddVoiceRequest(name, files, description, labels));
+	}
+	public String editVoice(String voiceId, String name, File[] files, String description, Map<String, String> labels) {
+		return sendRequest(new PostEditVoiceRequest(voiceId, name, files, description, labels));
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/enums/HttpRequestType.java

@@ -1,5 +1,5 @@
 package net.andrewcpu.elevenlabs.enums;
 
 public enum HttpRequestType {
-	POST, GET, PUT, DELETE;
+	POST, GET, PUT, DELETE
 }

src/main/java/net/andrewcpu/elevenlabs/model/history/History.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class History extends ElevenModel {
 
 	public static History get() {
-		return ElevenLabs.getHistory();
+		return ElevenLabs.getHistoryAPI().getHistory();
 	}
 
 	@JsonProperty("history")
@@ -57,11 +57,11 @@ public class History extends ElevenModel {
 	}
 
 	public File downloadHistory(String... historyIds) {
-		return ElevenLabs.getHistoryItemAudio(historyIds);
+		return ElevenLabs.getHistoryAPI().getHistoryItemAudio(historyIds);
 	}
 
 	public File downloadHistory(HistoryItem... items) {
-		return ElevenLabs.getHistoryItemAudio(Arrays.stream(items).map(HistoryItem::getHistoryItemId).toArray(String[]::new));
+		return ElevenLabs.getHistoryAPI().getHistoryItemAudio(Arrays.stream(items).map(HistoryItem::getHistoryItemId).toArray(String[]::new));
 	}
 
 	@JsonIgnore

src/main/java/net/andrewcpu/elevenlabs/model/history/HistoryItem.java

@@ -124,11 +124,11 @@ public class HistoryItem extends ElevenModel {
 	}
 
 	public String delete() {
-		return ElevenLabs.deleteHistoryItem(historyItemId);
+		return ElevenLabs.getHistoryAPI().deleteHistoryItem(historyItemId);
 	}
 
 	public File downloadAudio() {
-		return ElevenLabs.getHistoryItemAudio(historyItemId);
+		return ElevenLabs.getHistoryAPI().getHistoryItemAudio(historyItemId);
 	}
 
 	@JsonIgnore

src/main/java/net/andrewcpu/elevenlabs/model/projects/Chapter.java

@@ -1,9 +1,27 @@
 package net.andrewcpu.elevenlabs.model.projects;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import net.andrewcpu.elevenlabs.ElevenLabs;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
 
+import java.util.List;
+
 public class Chapter extends ElevenModel {
+
+	public String deleteChapter(String projectId) {
+		return ElevenLabs.getProjectsAPI().deleteChapter(projectId, chapterId);
+	}
+
+	public String convertChapter(String projectId) {
+		return ElevenLabs.getProjectsAPI().convertChapter(projectId, chapterId);
+	}
+
+	public List<ChapterSnapshot> getChapterSnapshots(String projectId) {
+		return ElevenLabs.getProjectsAPI().getChapterSnapshots(projectId, chapterId);
+	}
+
+
 	@JsonProperty("chapter_id")
 	private String chapterId;
 
@@ -24,4 +42,66 @@ public class Chapter extends ElevenModel {
 
 	@JsonProperty("statistics")
 	private Statistics statistics;
+
+	public Chapter() {
+	}
+
+	public Chapter(String chapterId, String name, long lastConversionDateUnix, double conversionProgress, boolean canBeDownloaded, String state, Statistics statistics) {
+		this.chapterId = chapterId;
+		this.name = name;
+		this.lastConversionDateUnix = lastConversionDateUnix;
+		this.conversionProgress = conversionProgress;
+		this.canBeDownloaded = canBeDownloaded;
+		this.state = state;
+		this.statistics = statistics;
+	}
+
+	@JsonIgnore
+	public String getChapterId() {
+		return chapterId;
+	}
+
+	@JsonIgnore
+	public String getName() {
+		return name;
+	}
+
+	@JsonIgnore
+	public long getLastConversionDateUnix() {
+		return lastConversionDateUnix;
+	}
+
+	@JsonIgnore
+	public double getConversionProgress() {
+		return conversionProgress;
+	}
+
+	@JsonIgnore
+	public boolean isCanBeDownloaded() {
+		return canBeDownloaded;
+	}
+
+	@JsonIgnore
+	public String getState() {
+		return state;
+	}
+
+	@JsonIgnore
+	public Statistics getStatistics() {
+		return statistics;
+	}
+
+	@Override
+	@JsonIgnore
+	public String toString() {
+		return "Chapter{" +
+				"chapterId='" + chapterId + '\'' +
+				", name='" + name + '\'' +
+				", lastConversionDateUnix=" + lastConversionDateUnix +
+				", conversionProgress=" + conversionProgress +
+				", canBeDownloaded=" + canBeDownloaded +
+				", state='" + state + '\'' +
+				", statistics=" + statistics +
+				'}';
+	}
 }

src/main/java/net/andrewcpu/elevenlabs/model/projects/ChapterSnapshot.java

@@ -2,9 +2,17 @@ package net.andrewcpu.elevenlabs.model.projects;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import net.andrewcpu.elevenlabs.ElevenLabs;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
 
+import java.io.InputStream;
+
 public class ChapterSnapshot extends ElevenModel {
+
+	public InputStream getAudioStream() {
+		return ElevenLabs.getProjectsAPI().getChapterSnapshotAudioStream(projectId, chapterId, chapterSnapshotId);
+	}
+
 	public ChapterSnapshot() {
 	}
 

src/main/java/net/andrewcpu/elevenlabs/model/projects/Project.java

@@ -4,13 +4,59 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import net.andrewcpu.elevenlabs.ElevenLabs;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
+import net.andrewcpu.elevenlabs.model.request.AddProjectRequest;
 
 import java.util.List;
 
 public class Project extends ElevenModel {
 
 	public static List<Project> getProjects() {
-		return ElevenLabs.getProjects().getProjects();
+		return ElevenLabs.getProjectsAPI().getProjects();
+	}
+
+	public static Project addProject(AddProjectRequest builder) {
+		return ElevenLabs.getProjectsAPI().addProject(builder);
+	}
+
+	public static Project getProjectById(String projectId) {
+		return ElevenLabs.getProjectsAPI().getProject(projectId);
+	}
+
+	public List<Chapter> fetchUpdatedChapters() {
+		this.chapters = ElevenLabs.getProjectsAPI().getChapters(projectId);
+		return this.chapters;
+	}
+
+	public String deleteProject() {
+		return ElevenLabs.getProjectsAPI().deleteProject(projectId);
+	}
+
+	public String convertProject() {
+		return ElevenLabs.getProjectsAPI().convertProject(projectId);
+	}
+
+	public List<ProjectSnapshot> getSnapshots() {
+		return ElevenLabs.getProjectsAPI().getProjectSnapshots(projectId);
+	}
+
+	public Chapter getChapterById(String chapterId) {
+		return ElevenLabs.getProjectsAPI().getChapterById(projectId, chapterId);
+	}
+
+	public Project(String projectId, String name, long unixCreateDate, String defaultTitleVoiceId, String defaultParagraphVoiceId, String defaultModelId, long lastConversionDateUnix, boolean canBeDownloaded, String state, List<Chapter> chapters) {
+		this.projectId = projectId;
+		this.name = name;
+		this.unixCreateDate = unixCreateDate;
+		this.defaultTitleVoiceId = defaultTitleVoiceId;
+		this.defaultParagraphVoiceId = defaultParagraphVoiceId;
+		this.defaultModelId = defaultModelId;
+		this.lastConversionDateUnix = lastConversionDateUnix;
+		this.canBeDownloaded = canBeDownloaded;
+		this.state = state;
+		this.chapters = chapters;
+	}
+
+	public Project() {
 	}
 
 	@JsonProperty("project_id")

src/main/java/net/andrewcpu/elevenlabs/model/projects/ProjectSnapshot.java

@@ -2,9 +2,17 @@ package net.andrewcpu.elevenlabs.model.projects;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import net.andrewcpu.elevenlabs.ElevenLabs;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
 
+import java.io.InputStream;
+
 public class ProjectSnapshot extends ElevenModel {
+
+	public InputStream getAudioStream() {
+		return ElevenLabs.getProjectsAPI().getProjectSnapshotAudioStream(projectId, projectSnapshotId);
+	}
+
 	public ProjectSnapshot() {
 	}
 

src/main/java/net/andrewcpu/elevenlabs/model/request/AddProjectRequest.java

@@ -3,7 +3,6 @@ package net.andrewcpu.elevenlabs.model.request;
 import net.andrewcpu.elevenlabs.enums.ProjectOutputQuality;
 
 import java.io.File;
-import java.lang.invoke.StringConcatFactory;
 
 public class AddProjectRequest {
 	private String name;

src/main/java/net/andrewcpu/elevenlabs/model/request/CreateAudioNativeProjectRequest.java

@@ -2,7 +2,6 @@ package net.andrewcpu.elevenlabs.model.request;
 
 import net.andrewcpu.elevenlabs.model.ElevenModel;
 
-import javax.management.loading.PrivateClassLoader;
 import java.io.File;
 
 public class CreateAudioNativeProjectRequest extends ElevenModel {

src/main/java/net/andrewcpu/elevenlabs/model/response/GenerationTypeModel.java

@@ -1,7 +1,6 @@
 package net.andrewcpu.elevenlabs.model.response;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
 import net.andrewcpu.elevenlabs.model.Language;

src/main/java/net/andrewcpu/elevenlabs/model/tuning/FineTuning.java

@@ -1,7 +1,6 @@
 package net.andrewcpu.elevenlabs.model.tuning;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
 

src/main/java/net/andrewcpu/elevenlabs/model/user/Subscription.java

@@ -8,7 +8,7 @@ import net.andrewcpu.elevenlabs.model.ElevenModel;
 public class Subscription extends ElevenModel {
 	@JsonIgnore
 	public static Subscription get() {
-		return ElevenLabs.getSubscription();
+		return ElevenLabs.getUserAPI().getSubscription();
 	}
 
 	@JsonProperty("tier")

src/main/java/net/andrewcpu/elevenlabs/model/user/User.java

@@ -8,7 +8,7 @@ import net.andrewcpu.elevenlabs.model.ElevenModel;
 public class User extends ElevenModel {
 
 	public static User get() {
-		return ElevenLabs.getUser();
+		return ElevenLabs.getUserAPI().getUser();
 	}
 
 	@JsonProperty("subscription")

src/main/java/net/andrewcpu/elevenlabs/model/voice/Sample.java

@@ -63,14 +63,14 @@ public class Sample extends ElevenModel {
 	}
 
 	public File downloadAudio() {
-		return ElevenLabs.getAudioSample(voice.getVoiceId(), sampleId);
+		return ElevenLabs.getSampleAPI().getAudioSample(voice.getVoiceId(), sampleId);
 	}
 
 	/**
 	 * Warning! This will delete the sample.
 	 */
 	public String delete() {
-		return ElevenLabs.deleteSample(voice.getVoiceId(), sampleId);
+		return ElevenLabs.getSampleAPI().deleteSample(voice.getVoiceId(), sampleId);
 	}
 
 	@Override

src/main/java/net/andrewcpu/elevenlabs/model/voice/Voice.java

@@ -16,15 +16,15 @@ import java.util.stream.Collectors;
 
 public class Voice extends ElevenModel {
 	public static List<Voice> getVoices() {
-		return ElevenLabs.getVoices();
+		return ElevenLabs.getVoiceAPI().getVoices();
 	}
 
 	public static Voice getVoice(String voiceId) {
-		return ElevenLabs.getVoice(voiceId);
+		return ElevenLabs.getVoiceAPI().getVoice(voiceId);
 	}
 
 	public static Voice getVoice(String voiceId, boolean withSettings) {
-		return ElevenLabs.getVoice(voiceId, withSettings);
+		return ElevenLabs.getVoiceAPI().getVoice(voiceId, withSettings);
 	}
 
 	@JsonProperty("voice_id")
@@ -122,15 +122,15 @@ public class Voice extends ElevenModel {
 	 * Warning! This will delete the voice.
 	 */
 	public String delete() {
-		return ElevenLabs.deleteVoice(voiceId);
+		return ElevenLabs.getVoiceAPI().deleteVoice(voiceId);
 	}
 	public VoiceSettings fetchSettings() {
-		this.settings = ElevenLabs.getVoiceSettings(voiceId);
+		this.settings = ElevenLabs.getVoiceAPI().getVoiceSettings(voiceId);
 		return settings;
 	}
 
 	public VoiceSettings updateVoiceSettings(VoiceSettings voiceSettings) {
-		ElevenLabs.editVoiceSettings(voiceId, voiceSettings);
+		ElevenLabs.getVoiceAPI().editVoiceSettings(voiceId, voiceSettings);
 		this.settings = voiceSettings;
 		return settings;
 	}
@@ -153,98 +153,117 @@ public class Voice extends ElevenModel {
 	}
 
 	public File generate(String text, String model) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, model, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, model, settings);
 	}
 
 	public File generate(String text, String model, VoiceSettings settings) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, model, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, model, settings);
 	}
 
 	public File generate(String text, String model, VoiceSettings settings, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeech(voiceId,text, model, outputFormat,streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId,text, model, outputFormat,streamLatencyOptimization, settings);
 	}
 	public File generate(String text, String model, VoiceSettings settings, GeneratedAudioOutputFormat outputFormat) {
-		return ElevenLabs.generateTextToSpeech(voiceId,text, model, outputFormat,StreamLatencyOptimization.getDefault(), settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId,text, model, outputFormat,StreamLatencyOptimization.getDefault(), settings);
 	}
 	public File generate(String text, VoiceSettings settings, GeneratedAudioOutputFormat outputFormat) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", outputFormat,StreamLatencyOptimization.getDefault(), settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", outputFormat,StreamLatencyOptimization.getDefault(), settings);
 	}
 	public File generate(String text, VoiceSettings settings, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(),streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(),streamLatencyOptimization, settings);
 	}
 
 	public File generate(String text, VoiceSettings settings, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", outputFormat,streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", outputFormat,streamLatencyOptimization, settings);
 	}
 	public File generate(String text, GeneratedAudioOutputFormat outputFormat, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", outputFormat,streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", outputFormat,streamLatencyOptimization, settings);
 	}
 	public File generate(String text, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
 	}
 
 	public File generate(String text, VoiceSettings settings)  {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", settings);
 	}
 
 	public File generate(String text) {
-		return ElevenLabs.generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(voiceId, text, "eleven_monolingual_v1", settings);
 	}
 
 
 
 	public InputStream generateStream(String text, String model) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, model, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, model, settings);
 	}
 
 	public InputStream generateStream(String text, String model, VoiceSettings settings) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, model, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, model, settings);
 	}
 
 	public InputStream generateStream(String text, VoiceSettings settings)  {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", settings);
 	}
 
 	public InputStream generateStream(String text) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", settings);
 	}
 
-
-
-
-
 	public InputStream generateStream(String text, String model, GeneratedAudioOutputFormat generatedAudioOutputFormat, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, model, generatedAudioOutputFormat, streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, model, generatedAudioOutputFormat, streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text, String model,  GeneratedAudioOutputFormat generatedAudioOutputFormat, StreamLatencyOptimization streamLatencyOptimization, VoiceSettings settings) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, model, generatedAudioOutputFormat, streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, model, generatedAudioOutputFormat, streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text, VoiceSettings settings,  GeneratedAudioOutputFormat generatedAudioOutputFormat, StreamLatencyOptimization streamLatencyOptimization)  {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", generatedAudioOutputFormat, streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", generatedAudioOutputFormat, streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text,  GeneratedAudioOutputFormat generatedAudioOutputFormat, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", generatedAudioOutputFormat, streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", generatedAudioOutputFormat, streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text, String model, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, model, GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, model, GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text, String model, StreamLatencyOptimization streamLatencyOptimization, VoiceSettings settings) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, model, GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, model, GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text, VoiceSettings settings, StreamLatencyOptimization streamLatencyOptimization)  {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
 	}
 
 	public InputStream generateStream(String text, StreamLatencyOptimization streamLatencyOptimization) {
-		return ElevenLabs.generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
+		return ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(voiceId, text, "eleven_monolingual_v1", GeneratedAudioOutputFormat.getDefault(), streamLatencyOptimization, settings);
 	}
 
+	public File speechToSpeech(File audioFile, StreamLatencyOptimization latencyOptimization, String modelId, VoiceSettings voiceSettings) {
+		return ElevenLabs.getSpeechToSpeechAPI().generateSpeechToSpeech(voiceId, voiceSettings, modelId, audioFile, latencyOptimization);
+	}
+
+	public File speechToSpeech(File audioFile, StreamLatencyOptimization latencyOptimization, String modelId) {
+		return speechToSpeech(audioFile, latencyOptimization, modelId, settings);
+	}
+
+	public File speechToSpeech(File audioFile, String modelId) {
+		return speechToSpeech(audioFile, StreamLatencyOptimization.getDefault(), modelId,settings);
+	}
+
+	public InputStream speechToSpeechStream(File audioFile, StreamLatencyOptimization latencyOptimization, String modelId, VoiceSettings voiceSettings) {
+		return ElevenLabs.getSpeechToSpeechAPI().generateSpeechToSpeechStream(voiceId, voiceSettings,modelId,audioFile,latencyOptimization);
+	}
+
+	public InputStream speechToSpeechStream(File audioFile, StreamLatencyOptimization latencyOptimization, String modelId) {
+		return speechToSpeechStream(audioFile,latencyOptimization,modelId,settings);
+	}
+
+	public InputStream speechToSpeechStream(File audioFile, String modelId) {
+		return speechToSpeechStream(audioFile, StreamLatencyOptimization.getDefault(),modelId);
+	}
 
 	@Override
 	@JsonIgnore

src/main/java/net/andrewcpu/elevenlabs/model/voice/VoiceBuilder.java

@@ -81,12 +81,12 @@ public class VoiceBuilder {
 	}
 
 	public Voice create() {
-		CreateVoiceResponse createVoiceResponse = ElevenLabs.createVoice(name, files.toArray(File[]::new), description, labels);
+		CreateVoiceResponse createVoiceResponse = ElevenLabs.getVoiceAPI().createVoice(name, files.toArray(File[]::new), description, labels);
 		return Voice.getVoice(createVoiceResponse.getVoiceId(), true);
 	}
 
 	public Voice edit() {
-		ElevenLabs.editVoice(voice.getVoiceId(), name, files.toArray(File[]::new), description, labels);
+		ElevenLabs.getVoiceAPI().editVoice(voice.getVoiceId(), name, files.toArray(File[]::new), description, labels);
 		voice = voice.refresh();
 		return voice;
 	}

src/main/java/net/andrewcpu/elevenlabs/model/voice/VoiceSettings.java

@@ -7,7 +7,7 @@ import net.andrewcpu.elevenlabs.model.ElevenModel;
 
 public class VoiceSettings extends ElevenModel {
 	public static VoiceSettings getDefaultVoiceSettings() {
-		return ElevenLabs.getDefaultVoiceSettings();
+		return ElevenLabs.getVoiceAPI().getDefaultVoiceSettings();
 	}
 	@JsonProperty("stability")
 	private double stability;

src/main/java/net/andrewcpu/elevenlabs/requests/ElevenLabsRequest.java

@@ -8,9 +8,9 @@ import java.util.Map;
 import static net.andrewcpu.elevenlabs.util.ElevenNetworkUtil.buildQueryParameters;
 
 public abstract class ElevenLabsRequest<T> {
-	private HttpRequestType type;
-	private String endpoint;
-	private Class<T> responseClass;
+	private final HttpRequestType type;
+	private final String endpoint;
+	private final Class<T> responseClass;
 
 	public ElevenLabsRequest(HttpRequestType type, String endpoint, Class<T> clazz) {
 		this.type = type;

src/main/java/net/andrewcpu/elevenlabs/requests/audionative/PostCreateAudioNativeProjectRequest.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class PostCreateAudioNativeProjectRequest extends PostRequest<CreateAudioEnabledProjectModelResponse> {
-	private CreateAudioNativeProjectRequest request;
+	private final CreateAudioNativeProjectRequest request;
 	public PostCreateAudioNativeProjectRequest(CreateAudioNativeProjectRequest request) {
 		super("v1/audio-native", CreateAudioEnabledProjectModelResponse.class);
 		this.request = request;

src/main/java/net/andrewcpu/elevenlabs/requests/history/PostDownloadHistoryItemsRequest.java

@@ -8,7 +8,7 @@ import java.util.Arrays;
 import java.util.stream.Collectors;
 
 public class PostDownloadHistoryItemsRequest extends PostRequest<File> {
-	private String[] historyItemIds;
+	private final String[] historyItemIds;
 	public PostDownloadHistoryItemsRequest(String... historyItemIds) {
 		super("v1/history/download", File.class);
 		this.historyItemIds = historyItemIds;

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetChapterSnapshotsRequest.java

@@ -1,10 +1,11 @@
 package net.andrewcpu.elevenlabs.requests.projects;
 
+import net.andrewcpu.elevenlabs.model.response.ChapterSnapshotsModelResponse;
 import net.andrewcpu.elevenlabs.requests.GetRequest;
 
-public class GetChapterSnapshotsRequest extends GetRequest<GetChapterSnapshotsRequest> {
+public class GetChapterSnapshotsRequest extends GetRequest<ChapterSnapshotsModelResponse> {
 	public GetChapterSnapshotsRequest(String projectId, String chapterId) {
-		super("v1/projects/" + projectId + "/chapters/" + chapterId + "/snapshots", GetChapterSnapshotsRequest.class);
+		super("v1/projects/" + projectId + "/chapters/" + chapterId + "/snapshots", ChapterSnapshotsModelResponse.class);
 	}
 
 	@Override

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetProjectsRequest.java

@@ -3,8 +3,6 @@ package net.andrewcpu.elevenlabs.requests.projects;
 import net.andrewcpu.elevenlabs.model.response.ProjectsModelResponse;
 import net.andrewcpu.elevenlabs.requests.GetRequest;
 
-import java.util.HashMap;
-
 public class GetProjectsRequest extends GetRequest<ProjectsModelResponse> {
 	public GetProjectsRequest() {
 		super("v1/projects", ProjectsModelResponse.class);

src/main/java/net/andrewcpu/elevenlabs/requests/projects/PostAddProjectRequest.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class PostAddProjectRequest extends PostRequest<ProjectModelResponse> {
-	private AddProjectRequest request;
+	private final AddProjectRequest request;
 	public PostAddProjectRequest(AddProjectRequest request) {
 		super("v1/projects/add", ProjectModelResponse.class);
 		this.request = request;

src/main/java/net/andrewcpu/elevenlabs/requests/sts/PostSpeechToSpeechRequest.java

@@ -0,0 +1,39 @@
+package net.andrewcpu.elevenlabs.requests.sts;
+
+import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
+import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PostSpeechToSpeechRequest extends PostRequest<File> {
+	private final StreamLatencyOptimization latencyOptimization;
+	private final String modelId;
+	private final VoiceSettings voiceSettings;
+	private final File audio;
+	public PostSpeechToSpeechRequest(String voiceId, VoiceSettings voiceSettings, File audio, String modelId, StreamLatencyOptimization latencyOptimization) {
+		super("v1/speech-to-speech/" + voiceId, File.class);
+		this.latencyOptimization = latencyOptimization;
+		this.voiceSettings = voiceSettings;
+		this.audio = audio;
+		this.modelId = modelId;
+	}
+
+	@Override
+	public Map<String, String> getQueryParameters() {
+		Map<String, String> opts = new HashMap<>();
+		opts.put("optimize_streaming_latency",String.valueOf(latencyOptimization.getValue()));
+		return opts;
+	}
+
+	@Override
+	public Object getPayload() {
+		Map<String, Object> body = new HashMap<>();
+		body.put("audio", audio);
+		body.put("model_id", modelId);
+		body.put("voice_settings", voiceSettings);
+		return body;
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/sts/PostSpeechToSpeechStreamedRequest.java

@@ -0,0 +1,40 @@
+package net.andrewcpu.elevenlabs.requests.sts;
+
+import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
+import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
+import net.andrewcpu.elevenlabs.requests.PostRequest;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PostSpeechToSpeechStreamedRequest extends PostRequest<InputStream> {
+	private final StreamLatencyOptimization latencyOptimization;
+	private final String modelId;
+	private final VoiceSettings voiceSettings;
+	private final File audio;
+	public PostSpeechToSpeechStreamedRequest(String voiceId, VoiceSettings voiceSettings, File audio, String modelId, StreamLatencyOptimization latencyOptimization) {
+		super("v1/speech-to-speech/" + voiceId + "/stream", InputStream.class);
+		this.latencyOptimization = latencyOptimization;
+		this.voiceSettings = voiceSettings;
+		this.audio = audio;
+		this.modelId = modelId;
+	}
+
+	@Override
+	public Map<String, String> getQueryParameters() {
+		Map<String, String> opts = new HashMap<>();
+		opts.put("optimize_streaming_latency",String.valueOf(latencyOptimization.getValue()));
+		return opts;
+	}
+
+	@Override
+	public Object getPayload() {
+		Map<String, Object> body = new HashMap<>();
+		body.put("audio", audio);
+		body.put("model_id", modelId);
+		body.put("voice_settings", voiceSettings);
+		return body;
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/tts/PostTextToSpeechRequest.java

@@ -10,9 +10,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class PostTextToSpeechRequest extends PostRequest<File> {
-	private TextToSpeechRequest request;
-	private StreamLatencyOptimization streamLatencyOptimization;
-	private GeneratedAudioOutputFormat outputFormat;
+	private final TextToSpeechRequest request;
+	private final StreamLatencyOptimization streamLatencyOptimization;
+	private final GeneratedAudioOutputFormat outputFormat;
 
 	public PostTextToSpeechRequest(String voiceId, TextToSpeechRequest request) {
 		super("v1/text-to-speech/" + voiceId, File.class);

src/main/java/net/andrewcpu/elevenlabs/requests/tts/PostTextToSpeechStreamedRequest.java

@@ -5,15 +5,14 @@ import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
 import net.andrewcpu.elevenlabs.model.request.TextToSpeechRequest;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
 
-import java.io.File;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
 public class PostTextToSpeechStreamedRequest extends PostRequest<InputStream> {
-	private TextToSpeechRequest request;
-	private StreamLatencyOptimization streamLatencyOptimization;
-	private GeneratedAudioOutputFormat outputFormat;
+	private final TextToSpeechRequest request;
+	private final StreamLatencyOptimization streamLatencyOptimization;
+	private final GeneratedAudioOutputFormat outputFormat;
 
 	public PostTextToSpeechStreamedRequest(String voiceId, TextToSpeechRequest request) {
 		super("v1/text-to-speech/" + voiceId, InputStream.class);

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoiceRequest.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class GetVoiceRequest extends GetRequest<Voice> {
-	private boolean withSettings;
+	private final boolean withSettings;
 	public GetVoiceRequest(String voiceId) {
 		this(voiceId,  true);
 	}

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostAddVoiceRequest.java

@@ -8,10 +8,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class PostAddVoiceRequest extends PostRequest<CreateVoiceResponse> {
-	private String name;
-	private File[] samples;
-	private String description;
-	private Map<String, String> labels;
+	private final String name;
+	private final File[] samples;
+	private final String description;
+	private final Map<String, String> labels;
 	public PostAddVoiceRequest(String name, File[] samples, String description, Map<String, String> labels) {
 		super("v1/voices/add", CreateVoiceResponse.class);
 		this.name = name;

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostEditVoiceRequest.java

@@ -7,10 +7,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class PostEditVoiceRequest extends PostRequest<String> {
-	private String name;
-	private File[] samples;
-	private String description;
-	private Map<String, String> labels;
+	private final String name;
+	private final File[] samples;
+	private final String description;
+	private final Map<String, String> labels;
 	public PostEditVoiceRequest(String voiceId, String name, File[] samples, String description, Map<String, String> labels) {
 		super("v1/voices/" + voiceId + "/edit", String.class);
 		this.name = name;

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostEditVoiceSettingsRequest.java

@@ -4,7 +4,7 @@ import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 public class PostEditVoiceSettingsRequest extends PostRequest<String> {
-	private VoiceSettings voiceSettings;
+	private final VoiceSettings voiceSettings;
 	public PostEditVoiceSettingsRequest(String voiceId, VoiceSettings voiceSettings) {
 		super("v1/voices/" + voiceId + "/settings/edit", String.class);
 		this.voiceSettings = voiceSettings;

src/main/java/net/andrewcpu/elevenlabs/util/ElevenNetworkUtil.java

@@ -12,16 +12,19 @@ import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.core5.http.*;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.net.URIBuilder;
 
-
 import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -47,11 +50,7 @@ public class ElevenNetworkUtil {
 	}
 
 	private static String encodeValue(String value) {
-		try {
-			return URLEncoder.encode(value, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException("Encoding not supported", e);
-		}
+		return URLEncoder.encode(value, StandardCharsets.UTF_8);
 	}
 
 	public static HttpUriRequestBase getRequest(HttpRequestType type, String path) {

src/test/java/net/andrewcpu/elevenlabs/ElevenLabsTest.java

@@ -2,7 +2,7 @@ package net.andrewcpu.elevenlabs;
 
 
 public class ElevenLabsTest {
-	public static final String ELEVEN_LABS_API_KEY = System.getenv("ELEVEN_LABS_API_KEY");
+	public static final String ELEVEN_LABS_API_KEY = System.getenv("ELEVENLABS_API_KEY");
 	public static final String TEST_VOICE = "ZjJOFdM86g4E9U6OhzUo";
 	static {
 		ElevenLabs.setApiKey(ELEVEN_LABS_API_KEY);

src/test/java/net/andrewcpu/elevenlabs/History/HistoryTest.java

@@ -16,30 +16,30 @@ public class HistoryTest extends ElevenLabsTest {
 	@Test
 	public void testGetHistory() {
 		assertFalse("Failed to get history.", doesThrow(() -> {
-			ElevenLabs.getHistory();
+			ElevenLabs.getHistoryAPI().getHistory();
 		}));
 	}
 
 	@Test
 	public void testGetHistoryItem() {
-		History history = ElevenLabs.getHistory();
+		History history = ElevenLabs.getHistoryAPI().getHistory();
 		assertNotNull(history);
 		List<HistoryItem> items = history.getHistoryItems();
 		assertNotNull(items);
 		assertTrue(items.size() != 0);
 		HistoryItem item = history.getHistoryItems().get(0);
 		assertFalse("Failed to get history item", doesThrow(() -> {
-			ElevenLabs.getHistoryItem(item.getHistoryItemId());
+			ElevenLabs.getHistoryAPI().getHistoryItem(item.getHistoryItemId());
 		}));
 		assertFalse("Failed to download audio history.", doesThrow(() -> {
-			File output = ElevenLabs.getHistoryItemAudio(item.getHistoryItemId());
+			File output = ElevenLabs.getHistoryAPI().getHistoryItemAudio(item.getHistoryItemId());
 			output.delete();
 		}));
 		assertTrue(items.size() >= 2);
 		HistoryItem item2 = history.getHistoryItems().get(1);
 
 		assertFalse("Failed to download audio history (grouped).", doesThrow(() -> {
-			File output = ElevenLabs.getHistoryItemAudio(item.getHistoryItemId(), item2.getHistoryItemId());
+			File output = ElevenLabs.getHistoryAPI().getHistoryItemAudio(item.getHistoryItemId(), item2.getHistoryItemId());
 			System.out.println(output.getName());
 			output.delete();
 		}));

src/test/java/net/andrewcpu/elevenlabs/Models/AvailableModelsTest.java

@@ -17,7 +17,7 @@ public class AvailableModelsTest extends ElevenLabsTest {
 	public void testGetModels() {
 		GenerationTypeModel[] models = null;
 		try{
-			models = ElevenLabs.getAvailableModels();
+			models = ElevenLabs.getModelsAPI().getAvailableModels();
 			System.out.println(Arrays.stream(models).map(Object::toString).collect(Collectors.toList()));
 		}catch (Exception e) {
 			e.printStackTrace();

src/test/java/net/andrewcpu/elevenlabs/Sample/AudioSampleTest.java

@@ -16,18 +16,18 @@ public class AudioSampleTest extends ElevenLabsTest {
 	public void testGetAudioSamples() {
 		assertFalse("Couldn't load audio samples.", doesThrow(() -> {
 			List<Sample> samples = null;
-			samples = ElevenLabs.getVoice(TEST_VOICE, true).getSamples();
+			samples = ElevenLabs.getVoiceAPI().getVoice(TEST_VOICE, true).getSamples();
 			assertNotNull(samples);
 		}));
 	}
 	@Test
 	public void testGetAudioSample() {
 		assertFalse("Couldn't load audio sample.", doesThrow(() -> {
-			Voice voice = ElevenLabs.getVoice(TEST_VOICE, true);
+			Voice voice = ElevenLabs.getVoiceAPI().getVoice(TEST_VOICE, true);
 			assertNotNull("Voice is null!", voice);
 			assertNotNull("Voice samples are null!", voice.getSamples());
 			assertTrue("No samples to test!", voice.getSamples().size() != 0);
-			File file = ElevenLabs.getAudioSample(TEST_VOICE, voice.getSamples().get(0).getSampleId());
+			File file = ElevenLabs.getSampleAPI().getAudioSample(TEST_VOICE, voice.getSamples().get(0).getSampleId());
 			assertNotNull(file);
 			file.delete();
 		}));

src/test/java/net/andrewcpu/elevenlabs/TextToSpeech/TextToSpeechTest.java

@@ -14,7 +14,7 @@ public class TextToSpeechTest extends ElevenLabsTest {
 	@Test
 	public void testDownloadResponse() {
 		assertFalse("Cannot download tts!", doesThrow(() -> {
-			File file = ElevenLabs.generateTextToSpeech(TEST_VOICE, "This is a test", "eleven_monolingual_v1", new VoiceSettings(0.7, 0.7, 0, true));
+			File file = ElevenLabs.getTextToSpeechAPI().generateTextToSpeech(TEST_VOICE, "This is a test", "eleven_monolingual_v1", new VoiceSettings(0.7, 0.7, 0, true));
 			file.delete();
 		}));
 	}
@@ -22,7 +22,7 @@ public class TextToSpeechTest extends ElevenLabsTest {
 	@Test
 	public void testStreamedResponse() {
 		assertFalse("Cannot strem tts!", doesThrow(() -> {
-			InputStream inputStream = ElevenLabs.generateTextToSpeechStreamed(TEST_VOICE, "This is a test", "eleven_monolingual_v1", new VoiceSettings(0.7, 0.7, 0, true));
+			InputStream inputStream = ElevenLabs.getTextToSpeechAPI().generateTextToSpeechStreamed(TEST_VOICE, "This is a test", "eleven_monolingual_v1", new VoiceSettings(0.7, 0.7, 0, true));
 			File tmp;
 			try {
 				tmp = File.createTempFile("test", "audio");

src/test/java/net/andrewcpu/elevenlabs/User/UserTest.java

@@ -4,27 +4,26 @@ import net.andrewcpu.elevenlabs.ElevenLabs;
 import net.andrewcpu.elevenlabs.ElevenLabsTest;
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class UserTest extends ElevenLabsTest {
 	@Test
 	public void testGetUser() {
 		try{
-			ElevenLabs.getUser();
+			ElevenLabs.getUserAPI().getUser();
 		}catch (Exception e) {
 			e.printStackTrace();
-			assertTrue("Failed to get user: " + e.getMessage(), false);
+			fail("Failed to get user: " + e.getMessage());
 		}
 	}
 
 	@Test
 	public void testGetSubscription() {
 		try{
-			ElevenLabs.getSubscription();
+			ElevenLabs.getUserAPI().getSubscription();
 		}catch (Exception e) {
 			e.printStackTrace();
-			assertFalse("Failed to get subscription: " + e.getMessage(), true);
+			fail("Failed to get subscription: " + e.getMessage());
 		}
 	}
 }

src/test/java/net/andrewcpu/elevenlabs/Voice/VoiceTest.java

@@ -13,8 +13,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 
 public class VoiceTest extends ElevenLabsTest {
@@ -22,34 +21,34 @@ public class VoiceTest extends ElevenLabsTest {
 	public void testGetVoiceWithSettings() {
 		Voice voice = null;
 		try{
-			voice = ElevenLabs.getVoice(ElevenLabsTest.TEST_VOICE, true);
+			voice = ElevenLabs.getVoiceAPI().getVoice(ElevenLabsTest.TEST_VOICE, true);
 		}catch (Exception e){
 			e.printStackTrace();
-			assertTrue("Failed to get voice: " + e.getMessage(), voice != null);
+			assertNotNull("Failed to get voice: " + e.getMessage(), voice);
 		}
-		assertTrue(voice.getSettings() != null);
+		assertNotNull(voice.getSettings());
 	}
 
 	@Test
 	public void testGetVoiceWithoutSettings() {
 		Voice voice = null;
 		try{
-			voice = ElevenLabs.getVoice(ElevenLabsTest.TEST_VOICE, false);
+			voice = ElevenLabs.getVoiceAPI().getVoice(ElevenLabsTest.TEST_VOICE, false);
 		}catch (Exception e){
 			e.printStackTrace();
-			assertTrue("Failed to get voice: " + e.getMessage(), voice != null);
+			assertNotNull("Failed to get voice: " + e.getMessage(), voice);
 		}
-		assertTrue(voice.getSettings() == null);
+		assertNull(voice.getSettings());
 	}
 
 	@Test
 	public void testGetVoiceSettings() {
 		VoiceSettings settings = null;
 		try{
-			settings = ElevenLabs.getVoiceSettings(ElevenLabsTest.TEST_VOICE);
+			settings = ElevenLabs.getVoiceAPI().getVoiceSettings(ElevenLabsTest.TEST_VOICE);
 		}catch (Exception e) {
 			e.printStackTrace();
-			assertTrue("Failed to get voice settings: " + e.getMessage(), false);
+			fail("Failed to get voice settings: " + e.getMessage());
 		}
 	}
 
@@ -57,10 +56,10 @@ public class VoiceTest extends ElevenLabsTest {
 	public void getDefaultVoiceSettings() {
 		VoiceSettings defaultVoiceSettings = null;
 		try {
-			defaultVoiceSettings = ElevenLabs.getDefaultVoiceSettings();
+			defaultVoiceSettings = ElevenLabs.getVoiceAPI().getDefaultVoiceSettings();
 		}catch (Exception e) {
 			e.printStackTrace();
-			assertTrue("Failed to get default voice settings: " + e.getMessage(), false);
+			fail("Failed to get default voice settings: " + e.getMessage());
 		}
 	}
 
@@ -68,10 +67,10 @@ public class VoiceTest extends ElevenLabsTest {
 	public void getVoices() {
 		List<Voice> voices = null;
 		try{
-			voices = ElevenLabs.getVoices();
+			voices = ElevenLabs.getVoiceAPI().getVoices();
 		}catch (Exception e) {
-			e.printStackTrace();;
-			assertTrue("Failed to get voices: " + e.getMessage(), false);
+			e.printStackTrace();
+			fail("Failed to get voices: " + e.getMessage());
 		}
 		assertTrue(voices != null && voices.size() > 0);
 	}