diff --git a/Sources/OpenAIKit/Types/Enums/Audio/AudioResponseFormat.swift b/Sources/OpenAIKit/Models/Audio/AudioResponseFormat.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Audio/AudioResponseFormat.swift
rename to Sources/OpenAIKit/Models/Audio/AudioResponseFormat.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Audio/TranscriptionParameters.swift b/Sources/OpenAIKit/Models/Audio/TranscriptionParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Audio/TranscriptionParameters.swift
rename to Sources/OpenAIKit/Models/Audio/TranscriptionParameters.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Audio/TranscriptionResponse.swift b/Sources/OpenAIKit/Models/Audio/TranscriptionResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Audio/TranscriptionResponse.swift
rename to Sources/OpenAIKit/Models/Audio/TranscriptionResponse.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Chat/ChatModels.swift b/Sources/OpenAIKit/Models/Chat/ChatModels.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Chat/ChatModels.swift
rename to Sources/OpenAIKit/Models/Chat/ChatModels.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Chat/ChatParameters.swift b/Sources/OpenAIKit/Models/Chat/ChatParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Chat/ChatParameters.swift
rename to Sources/OpenAIKit/Models/Chat/ChatParameters.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Chat/ChatResponse.swift b/Sources/OpenAIKit/Models/Chat/ChatResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Chat/ChatResponse.swift
rename to Sources/OpenAIKit/Models/Chat/ChatResponse.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Chat/ChatRole.swift b/Sources/OpenAIKit/Models/Chat/ChatRole.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Chat/ChatRole.swift
rename to Sources/OpenAIKit/Models/Chat/ChatRole.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Chat/Function.swift b/Sources/OpenAIKit/Models/Chat/Function.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Chat/Function.swift
rename to Sources/OpenAIKit/Models/Chat/Function.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Chat/Parameter.swift b/Sources/OpenAIKit/Models/Chat/Parameter.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Chat/Parameter.swift
rename to Sources/OpenAIKit/Models/Chat/Parameter.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Chat/ParameterDetail.swift b/Sources/OpenAIKit/Models/Chat/ParameterDetail.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Chat/ParameterDetail.swift
rename to Sources/OpenAIKit/Models/Chat/ParameterDetail.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Completions/CompletionModels.swift b/Sources/OpenAIKit/Models/Completions/CompletionModels.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Completions/CompletionModels.swift
rename to Sources/OpenAIKit/Models/Completions/CompletionModels.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Completions/CompletionParameters.swift b/Sources/OpenAIKit/Models/Completions/CompletionParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Completions/CompletionParameters.swift
rename to Sources/OpenAIKit/Models/Completions/CompletionParameters.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Completions/CompletionResponse.swift b/Sources/OpenAIKit/Models/Completions/CompletionResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Completions/CompletionResponse.swift
rename to Sources/OpenAIKit/Models/Completions/CompletionResponse.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Embeddings/EmbeddingsData.swift b/Sources/OpenAIKit/Models/Embeddings/EmbeddingsData.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Embeddings/EmbeddingsData.swift
rename to Sources/OpenAIKit/Models/Embeddings/EmbeddingsData.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Embeddings/EmbeddingsParameters.swift b/Sources/OpenAIKit/Models/Embeddings/EmbeddingsParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Embeddings/EmbeddingsParameters.swift
rename to Sources/OpenAIKit/Models/Embeddings/EmbeddingsParameters.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Embeddings/EmbeddingsResponse.swift b/Sources/OpenAIKit/Models/Embeddings/EmbeddingsResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Embeddings/EmbeddingsResponse.swift
rename to Sources/OpenAIKit/Models/Embeddings/EmbeddingsResponse.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Embeddings/EmbeddingsUsage.swift b/Sources/OpenAIKit/Models/Embeddings/EmbeddingsUsage.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Embeddings/EmbeddingsUsage.swift
rename to Sources/OpenAIKit/Models/Embeddings/EmbeddingsUsage.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Files/File.swift b/Sources/OpenAIKit/Models/Files/File.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Files/File.swift
rename to Sources/OpenAIKit/Models/Files/File.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Files/FileContent.swift b/Sources/OpenAIKit/Models/Files/FileContent.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Files/FileContent.swift
rename to Sources/OpenAIKit/Models/Files/FileContent.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Files/FileStatus.swift b/Sources/OpenAIKit/Models/Files/FileStatus.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Files/FileStatus.swift
rename to Sources/OpenAIKit/Models/Files/FileStatus.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Files/ListFilesResponse.swift b/Sources/OpenAIKit/Models/Files/ListFilesResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Files/ListFilesResponse.swift
rename to Sources/OpenAIKit/Models/Files/ListFilesResponse.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Files/UploadFileParameters.swift b/Sources/OpenAIKit/Models/Files/UploadFileParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Files/UploadFileParameters.swift
rename to Sources/OpenAIKit/Models/Files/UploadFileParameters.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Images/ImageData.swift b/Sources/OpenAIKit/Models/Images/ImageData.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Images/ImageData.swift
rename to Sources/OpenAIKit/Models/Images/ImageData.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Images/ImageEditParameters.swift b/Sources/OpenAIKit/Models/Images/ImageEditParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Images/ImageEditParameters.swift
rename to Sources/OpenAIKit/Models/Images/ImageEditParameters.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Images/ImageModel.swift b/Sources/OpenAIKit/Models/Images/ImageModel.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Images/ImageModel.swift
rename to Sources/OpenAIKit/Models/Images/ImageModel.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Images/ImageParameters.swift b/Sources/OpenAIKit/Models/Images/ImageParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Images/ImageParameters.swift
rename to Sources/OpenAIKit/Models/Images/ImageParameters.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Images/ImageQuality.swift b/Sources/OpenAIKit/Models/Images/ImageQuality.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Images/ImageQuality.swift
rename to Sources/OpenAIKit/Models/Images/ImageQuality.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Images/ImageResolutions.swift b/Sources/OpenAIKit/Models/Images/ImageResolutions.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Images/ImageResolutions.swift
rename to Sources/OpenAIKit/Models/Images/ImageResolutions.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Images/ImageResponse.swift b/Sources/OpenAIKit/Models/Images/ImageResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Images/ImageResponse.swift
rename to Sources/OpenAIKit/Models/Images/ImageResponse.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Images/ImageStyle.swift b/Sources/OpenAIKit/Models/Images/ImageStyle.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Images/ImageStyle.swift
rename to Sources/OpenAIKit/Models/Images/ImageStyle.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Images/ImageVariationParameters.swift b/Sources/OpenAIKit/Models/Images/ImageVariationParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Images/ImageVariationParameters.swift
rename to Sources/OpenAIKit/Models/Images/ImageVariationParameters.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Images/ResponseFormat.swift b/Sources/OpenAIKit/Models/Images/ResponseFormat.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Images/ResponseFormat.swift
rename to Sources/OpenAIKit/Models/Images/ResponseFormat.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Parameters/Moderations/ConentPolicyParameters.swift b/Sources/OpenAIKit/Models/Moderations/ConentPolicyParameters.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Parameters/Moderations/ConentPolicyParameters.swift
rename to Sources/OpenAIKit/Models/Moderations/ConentPolicyParameters.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyCategories.swift b/Sources/OpenAIKit/Models/Moderations/ContentPolicyCategories.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyCategories.swift
rename to Sources/OpenAIKit/Models/Moderations/ContentPolicyCategories.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyCategoryScore.swift b/Sources/OpenAIKit/Models/Moderations/ContentPolicyCategoryScore.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyCategoryScore.swift
rename to Sources/OpenAIKit/Models/Moderations/ContentPolicyCategoryScore.swift
diff --git a/Sources/OpenAIKit/Types/Enums/Moderations/ContentPolicyModels.swift b/Sources/OpenAIKit/Models/Moderations/ContentPolicyModels.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/Moderations/ContentPolicyModels.swift
rename to Sources/OpenAIKit/Models/Moderations/ContentPolicyModels.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyResponse.swift b/Sources/OpenAIKit/Models/Moderations/ContentPolicyResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyResponse.swift
rename to Sources/OpenAIKit/Models/Moderations/ContentPolicyResponse.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyResult.swift b/Sources/OpenAIKit/Models/Moderations/ContentPolicyResult.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Moderations/ContentPolicyResult.swift
rename to Sources/OpenAIKit/Models/Moderations/ContentPolicyResult.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/ChatChoice.swift b/Sources/OpenAIKit/Models/OpenAI/ChatChoice.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/ChatChoice.swift
rename to Sources/OpenAIKit/Models/OpenAI/ChatChoice.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/ChatMessage.swift b/Sources/OpenAIKit/Models/OpenAI/ChatMessage.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/ChatMessage.swift
rename to Sources/OpenAIKit/Models/OpenAI/ChatMessage.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/Choice.swift b/Sources/OpenAIKit/Models/OpenAI/Choice.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/Choice.swift
rename to Sources/OpenAIKit/Models/OpenAI/Choice.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/Configuration.swift b/Sources/OpenAIKit/Models/OpenAI/Configuration.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/Configuration.swift
rename to Sources/OpenAIKit/Models/OpenAI/Configuration.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/DeleteObject.swift b/Sources/OpenAIKit/Models/OpenAI/DeleteObject.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/DeleteObject.swift
rename to Sources/OpenAIKit/Models/OpenAI/DeleteObject.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/FormData.swift b/Sources/OpenAIKit/Models/OpenAI/FormData.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/FormData.swift
rename to Sources/OpenAIKit/Models/OpenAI/FormData.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/FunctionCall.swift b/Sources/OpenAIKit/Models/OpenAI/FunctionCall.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/FunctionCall.swift
rename to Sources/OpenAIKit/Models/OpenAI/FunctionCall.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/OpenAIErrorMessage.swift b/Sources/OpenAIKit/Models/OpenAI/OpenAIErrorMessage.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/OpenAIErrorMessage.swift
rename to Sources/OpenAIKit/Models/OpenAI/OpenAIErrorMessage.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/OpenAIErrorResponse.swift b/Sources/OpenAIKit/Models/OpenAI/OpenAIErrorResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/OpenAIErrorResponse.swift
rename to Sources/OpenAIKit/Models/OpenAI/OpenAIErrorResponse.swift
diff --git a/Sources/OpenAIKit/Types/Enums/OpenAI/OpenAIErrors.swift b/Sources/OpenAIKit/Models/OpenAI/OpenAIErrors.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/OpenAI/OpenAIErrors.swift
rename to Sources/OpenAIKit/Models/OpenAI/OpenAIErrors.swift
diff --git a/Sources/OpenAIKit/Types/Enums/OpenAI/OpenAIObject.swift b/Sources/OpenAIKit/Models/OpenAI/OpenAIObject.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Enums/OpenAI/OpenAIObject.swift
rename to Sources/OpenAIKit/Models/OpenAI/OpenAIObject.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/Usage.swift b/Sources/OpenAIKit/Models/OpenAI/Usage.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/OpenAI/Usage.swift
rename to Sources/OpenAIKit/Models/OpenAI/Usage.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Models/ListModelResponse.swift b/Sources/OpenAIKit/Models/OpenAIModels/ListModelResponse.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Models/ListModelResponse.swift
rename to Sources/OpenAIKit/Models/OpenAIModels/ListModelResponse.swift
diff --git a/Sources/OpenAIKit/Types/Structs/Schemas/Models/Model.swift b/Sources/OpenAIKit/Models/OpenAIModels/Model.swift
similarity index 100%
rename from Sources/OpenAIKit/Types/Structs/Schemas/Models/Model.swift
rename to Sources/OpenAIKit/Models/OpenAIModels/Model.swift