diff --git a/src/Pipedrive.net/Models/Request/ActivityFilters.cs b/src/Pipedrive.net/Models/Request/Activities/ActivityFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/ActivityFilters.cs
rename to src/Pipedrive.net/Models/Request/Activities/ActivityFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/ActivityUpdate.cs b/src/Pipedrive.net/Models/Request/Activities/ActivityUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/ActivityUpdate.cs
rename to src/Pipedrive.net/Models/Request/Activities/ActivityUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/NewActivity.cs b/src/Pipedrive.net/Models/Request/Activities/NewActivity.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewActivity.cs
rename to src/Pipedrive.net/Models/Request/Activities/NewActivity.cs
diff --git a/src/Pipedrive.net/Models/Request/DealActivityFilters.cs b/src/Pipedrive.net/Models/Request/Deals/DealActivityFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealActivityFilters.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealActivityFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/DealFilters.cs b/src/Pipedrive.net/Models/Request/Deals/DealFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealFilters.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/DealParticipantFilters.cs b/src/Pipedrive.net/Models/Request/Deals/DealParticipantFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealParticipantFilters.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealParticipantFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/DealProductFilters.cs b/src/Pipedrive.net/Models/Request/Deals/DealProductFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealProductFilters.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealProductFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/DealProductUpdate.cs b/src/Pipedrive.net/Models/Request/Deals/DealProductUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealProductUpdate.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealProductUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/DealUpdate.cs b/src/Pipedrive.net/Models/Request/Deals/DealUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealUpdate.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/DealUpdateFilters.cs b/src/Pipedrive.net/Models/Request/Deals/DealUpdateFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/DealUpdateFilters.cs
rename to src/Pipedrive.net/Models/Request/Deals/DealUpdateFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/NewDeal.cs b/src/Pipedrive.net/Models/Request/Deals/NewDeal.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewDeal.cs
rename to src/Pipedrive.net/Models/Request/Deals/NewDeal.cs
diff --git a/src/Pipedrive.net/Models/Request/NewDealProduct.cs b/src/Pipedrive.net/Models/Request/Deals/NewDealProduct.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewDealProduct.cs
rename to src/Pipedrive.net/Models/Request/Deals/NewDealProduct.cs
diff --git a/src/Pipedrive.net/Models/Request/FileFilters.cs b/src/Pipedrive.net/Models/Request/Files/FileFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/FileFilters.cs
rename to src/Pipedrive.net/Models/Request/Files/FileFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/FileUpdate.cs b/src/Pipedrive.net/Models/Request/Files/FileUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/FileUpdate.cs
rename to src/Pipedrive.net/Models/Request/Files/FileUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/NewFile.cs b/src/Pipedrive.net/Models/Request/Files/NewFile.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewFile.cs
rename to src/Pipedrive.net/Models/Request/Files/NewFile.cs
diff --git a/src/Pipedrive.net/Models/Request/LeadFilters.cs b/src/Pipedrive.net/Models/Request/Leads/LeadFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/LeadFilters.cs
rename to src/Pipedrive.net/Models/Request/Leads/LeadFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/NewNote.cs b/src/Pipedrive.net/Models/Request/Notes/NewNote.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewNote.cs
rename to src/Pipedrive.net/Models/Request/Notes/NewNote.cs
diff --git a/src/Pipedrive.net/Models/Request/NoteFilters.cs b/src/Pipedrive.net/Models/Request/Notes/NoteFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NoteFilters.cs
rename to src/Pipedrive.net/Models/Request/Notes/NoteFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/NoteUpdate.cs b/src/Pipedrive.net/Models/Request/Notes/NoteUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NoteUpdate.cs
rename to src/Pipedrive.net/Models/Request/Notes/NoteUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/OAuthAccessTokenRequest.cs b/src/Pipedrive.net/Models/Request/OAuth/OAuthAccessTokenRequest.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OAuthAccessTokenRequest.cs
rename to src/Pipedrive.net/Models/Request/OAuth/OAuthAccessTokenRequest.cs
diff --git a/src/Pipedrive.net/Models/Request/OAuthLoginRequest.cs b/src/Pipedrive.net/Models/Request/OAuth/OAuthLoginRequest.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OAuthLoginRequest.cs
rename to src/Pipedrive.net/Models/Request/OAuth/OAuthLoginRequest.cs
diff --git a/src/Pipedrive.net/Models/Request/OAuthRefreshTokenRequest.cs b/src/Pipedrive.net/Models/Request/OAuth/OAuthRefreshTokenRequest.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OAuthRefreshTokenRequest.cs
rename to src/Pipedrive.net/Models/Request/OAuth/OAuthRefreshTokenRequest.cs
diff --git a/src/Pipedrive.net/Models/Request/OAuthRevokeTokenRequest.cs b/src/Pipedrive.net/Models/Request/OAuth/OAuthRevokeTokenRequest.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OAuthRevokeTokenRequest.cs
rename to src/Pipedrive.net/Models/Request/OAuth/OAuthRevokeTokenRequest.cs
diff --git a/src/Pipedrive.net/Models/Request/NewOrganization.cs b/src/Pipedrive.net/Models/Request/Organizations/NewOrganization.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewOrganization.cs
rename to src/Pipedrive.net/Models/Request/Organizations/NewOrganization.cs
diff --git a/src/Pipedrive.net/Models/Request/OrganizationActivityFilters.cs b/src/Pipedrive.net/Models/Request/Organizations/OrganizationActivityFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OrganizationActivityFilters.cs
rename to src/Pipedrive.net/Models/Request/Organizations/OrganizationActivityFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/OrganizationDealFilters.cs b/src/Pipedrive.net/Models/Request/Organizations/OrganizationDealFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OrganizationDealFilters.cs
rename to src/Pipedrive.net/Models/Request/Organizations/OrganizationDealFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/OrganizationFileFilters.cs b/src/Pipedrive.net/Models/Request/Organizations/OrganizationFileFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OrganizationFileFilters.cs
rename to src/Pipedrive.net/Models/Request/Organizations/OrganizationFileFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/OrganizationFilters.cs b/src/Pipedrive.net/Models/Request/Organizations/OrganizationFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OrganizationFilters.cs
rename to src/Pipedrive.net/Models/Request/Organizations/OrganizationFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/OrganizationUpdate.cs b/src/Pipedrive.net/Models/Request/Organizations/OrganizationUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OrganizationUpdate.cs
rename to src/Pipedrive.net/Models/Request/Organizations/OrganizationUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/OrganizationUpdateFilters.cs b/src/Pipedrive.net/Models/Request/Organizations/OrganizationUpdateFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/OrganizationUpdateFilters.cs
rename to src/Pipedrive.net/Models/Request/Organizations/OrganizationUpdateFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/NewPerson.cs b/src/Pipedrive.net/Models/Request/Persons/NewPerson.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewPerson.cs
rename to src/Pipedrive.net/Models/Request/Persons/NewPerson.cs
diff --git a/src/Pipedrive.net/Models/Request/PersonActivityFilters.cs b/src/Pipedrive.net/Models/Request/Persons/PersonActivityFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PersonActivityFilters.cs
rename to src/Pipedrive.net/Models/Request/Persons/PersonActivityFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/PersonDealFilters.cs b/src/Pipedrive.net/Models/Request/Persons/PersonDealFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PersonDealFilters.cs
rename to src/Pipedrive.net/Models/Request/Persons/PersonDealFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/PersonFileFilters.cs b/src/Pipedrive.net/Models/Request/Persons/PersonFileFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PersonFileFilters.cs
rename to src/Pipedrive.net/Models/Request/Persons/PersonFileFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/PersonFilters.cs b/src/Pipedrive.net/Models/Request/Persons/PersonFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PersonFilters.cs
rename to src/Pipedrive.net/Models/Request/Persons/PersonFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/PersonUpdate.cs b/src/Pipedrive.net/Models/Request/Persons/PersonUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PersonUpdate.cs
rename to src/Pipedrive.net/Models/Request/Persons/PersonUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/PersonUpdateFilters.cs b/src/Pipedrive.net/Models/Request/Persons/PersonUpdateFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PersonUpdateFilters.cs
rename to src/Pipedrive.net/Models/Request/Persons/PersonUpdateFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/NewPipeline.cs b/src/Pipedrive.net/Models/Request/Pipelines/NewPipeline.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewPipeline.cs
rename to src/Pipedrive.net/Models/Request/Pipelines/NewPipeline.cs
diff --git a/src/Pipedrive.net/Models/Request/PipelineDealFilters.cs b/src/Pipedrive.net/Models/Request/Pipelines/PipelineDealFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PipelineDealFilters.cs
rename to src/Pipedrive.net/Models/Request/Pipelines/PipelineDealFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/PipelineUpdate.cs b/src/Pipedrive.net/Models/Request/Pipelines/PipelineUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/PipelineUpdate.cs
rename to src/Pipedrive.net/Models/Request/Pipelines/PipelineUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/NewProduct.cs b/src/Pipedrive.net/Models/Request/Products/NewProduct.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewProduct.cs
rename to src/Pipedrive.net/Models/Request/Products/NewProduct.cs
diff --git a/src/Pipedrive.net/Models/Request/NewProductPrice.cs b/src/Pipedrive.net/Models/Request/Products/NewProductPrice.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewProductPrice.cs
rename to src/Pipedrive.net/Models/Request/Products/NewProductPrice.cs
diff --git a/src/Pipedrive.net/Models/Request/ProductFilters.cs b/src/Pipedrive.net/Models/Request/Products/ProductFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/ProductFilters.cs
rename to src/Pipedrive.net/Models/Request/Products/ProductFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/ProductUpdate.cs b/src/Pipedrive.net/Models/Request/Products/ProductUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/ProductUpdate.cs
rename to src/Pipedrive.net/Models/Request/Products/ProductUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/NewStage.cs b/src/Pipedrive.net/Models/Request/Stages/NewStage.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewStage.cs
rename to src/Pipedrive.net/Models/Request/Stages/NewStage.cs
diff --git a/src/Pipedrive.net/Models/Request/StageDealFilters.cs b/src/Pipedrive.net/Models/Request/Stages/StageDealFilters.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/StageDealFilters.cs
rename to src/Pipedrive.net/Models/Request/Stages/StageDealFilters.cs
diff --git a/src/Pipedrive.net/Models/Request/StageUpdate.cs b/src/Pipedrive.net/Models/Request/Stages/StageUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/StageUpdate.cs
rename to src/Pipedrive.net/Models/Request/Stages/StageUpdate.cs
diff --git a/src/Pipedrive.net/Models/Request/CancelRecurringSubscription.cs b/src/Pipedrive.net/Models/Request/Subscriptions/CancelRecurringSubscription.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/CancelRecurringSubscription.cs
rename to src/Pipedrive.net/Models/Request/Subscriptions/CancelRecurringSubscription.cs
diff --git a/src/Pipedrive.net/Models/Request/NewInstallmentSubscription.cs b/src/Pipedrive.net/Models/Request/Subscriptions/NewInstallmentSubscription.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewInstallmentSubscription.cs
rename to src/Pipedrive.net/Models/Request/Subscriptions/NewInstallmentSubscription.cs
diff --git a/src/Pipedrive.net/Models/Request/NewPayment.cs b/src/Pipedrive.net/Models/Request/Subscriptions/NewPayment.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewPayment.cs
rename to src/Pipedrive.net/Models/Request/Subscriptions/NewPayment.cs
diff --git a/src/Pipedrive.net/Models/Request/NewRecurringSubscription.cs b/src/Pipedrive.net/Models/Request/Subscriptions/NewRecurringSubscription.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewRecurringSubscription.cs
rename to src/Pipedrive.net/Models/Request/Subscriptions/NewRecurringSubscription.cs
diff --git a/src/Pipedrive.net/Models/Request/NewUser.cs b/src/Pipedrive.net/Models/Request/Users/NewUser.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/NewUser.cs
rename to src/Pipedrive.net/Models/Request/Users/NewUser.cs
diff --git a/src/Pipedrive.net/Models/Request/UserUpdate.cs b/src/Pipedrive.net/Models/Request/Users/UserUpdate.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Request/UserUpdate.cs
rename to src/Pipedrive.net/Models/Request/Users/UserUpdate.cs
diff --git a/src/Pipedrive.net/Models/Response/File.cs b/src/Pipedrive.net/Models/Response/Files/File.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Response/File.cs
rename to src/Pipedrive.net/Models/Response/Files/File.cs
diff --git a/src/Pipedrive.net/Models/Response/Note.cs b/src/Pipedrive.net/Models/Response/Notes/Note.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Response/Note.cs
rename to src/Pipedrive.net/Models/Response/Notes/Note.cs
diff --git a/src/Pipedrive.net/Models/Response/OAuthToken.cs b/src/Pipedrive.net/Models/Response/OAuth/OAuthToken.cs
similarity index 100%
rename from src/Pipedrive.net/Models/Response/OAuthToken.cs
rename to src/Pipedrive.net/Models/Response/OAuth/OAuthToken.cs