diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e648d2e..0c6ac179 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - Retrieve, create and delete SongArrangement comments ([PR187](https://github.com/5pm-HDH/churchtools-api/pull/187))
-- Get GroupTypes ([PR188](https://github.com/5pm-HDH/churchtools-api/pull/188))
+- Get GroupTypes ([PR188](https://github.com/5pm-HDH/churchtools-api/pull/188), [PR198](https://github.com/5pm-HDH/churchtools-api/pull/198))
 - Get GroupTypeRoles ([PR197](https://github.com/5pm-HDH/churchtools-api/pull/197))
 - PHP coding standard ([PR193](https://github.com/5pm-HDH/churchtools-api/pull/193))
 
diff --git a/docs/out/GroupAPI.md b/docs/out/GroupAPI.md
index 6cd94137..2394568b 100644
--- a/docs/out/GroupAPI.md
+++ b/docs/out/GroupAPI.md
@@ -517,8 +517,8 @@
 ## Group-Types
 
 ```php
-        use CTApi\Models\Groups\Group\GroupType;
-        use CTApi\Models\Groups\Group\GroupTypeRequest;
+        use CTApi\Models\Groups\GroupType\GroupType;
+        use CTApi\Models\Groups\GroupType\GroupTypeRequest;
 
         $groupTypes = GroupTypeRequest::all();
 
@@ -534,8 +534,8 @@
 ```
 
 ```php
-        use CTApi\Models\Groups\Group\GroupType;
-        use CTApi\Models\Groups\Group\GroupTypeRequest;
+        use CTApi\Models\Groups\GroupType\GroupType;
+        use CTApi\Models\Groups\GroupType\GroupTypeRequest;
 
         $groupType = GroupTypeRequest::find(2);
 
diff --git a/src/Models/Groups/Group/GroupType.php b/src/Models/Groups/GroupType/GroupType.php
similarity index 98%
rename from src/Models/Groups/Group/GroupType.php
rename to src/Models/Groups/GroupType/GroupType.php
index 7c2dc866..ea470942 100644
--- a/src/Models/Groups/Group/GroupType.php
+++ b/src/Models/Groups/GroupType/GroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CTApi\Models\Groups\Group;
+namespace CTApi\Models\Groups\GroupType;
 
 use CTApi\Models\AbstractModel;
 use CTApi\Traits\Model\FillWithData;
diff --git a/src/Models/Groups/Group/GroupTypeRequest.php b/src/Models/Groups/GroupType/GroupTypeRequest.php
similarity index 94%
rename from src/Models/Groups/Group/GroupTypeRequest.php
rename to src/Models/Groups/GroupType/GroupTypeRequest.php
index 57b39a50..c48f91dd 100644
--- a/src/Models/Groups/Group/GroupTypeRequest.php
+++ b/src/Models/Groups/GroupType/GroupTypeRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CTApi\Models\Groups\Group;
+namespace CTApi\Models\Groups\GroupType;
 
 class GroupTypeRequest
 {
diff --git a/src/Models/Groups/Group/GroupTypeRequestBuilder.php b/src/Models/Groups/GroupType/GroupTypeRequestBuilder.php
similarity index 88%
rename from src/Models/Groups/Group/GroupTypeRequestBuilder.php
rename to src/Models/Groups/GroupType/GroupTypeRequestBuilder.php
index d64e3694..d44ed055 100644
--- a/src/Models/Groups/Group/GroupTypeRequestBuilder.php
+++ b/src/Models/Groups/GroupType/GroupTypeRequestBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CTApi\Models\Groups\Group;
+namespace CTApi\Models\Groups\GroupType;
 
 use CTApi\Models\AbstractRequestBuilder;
 
diff --git a/src/Models/Groups/GroupTypeRole/GroupTypeRole.php b/src/Models/Groups/GroupTypeRole/GroupTypeRole.php
index 7d0da993..29f6eb12 100644
--- a/src/Models/Groups/GroupTypeRole/GroupTypeRole.php
+++ b/src/Models/Groups/GroupTypeRole/GroupTypeRole.php
@@ -3,8 +3,8 @@
 namespace CTApi\Models\Groups\GroupTypeRole;
 
 use CTApi\Models\AbstractModel;
-use CTApi\Models\Groups\Group\GroupType;
-use CTApi\Models\Groups\Group\GroupTypeRequest;
+use CTApi\Models\Groups\GroupType\GroupType;
+use CTApi\Models\Groups\GroupType\GroupTypeRequest;
 use CTApi\Traits\Model\FillWithData;
 use CTApi\Traits\Model\MetaAttribute;
 
diff --git a/tests/Integration/Requests/GroupTypeRequestTest.php b/tests/Integration/Requests/GroupTypeRequestTest.php
index b29e1bbd..927121c3 100644
--- a/tests/Integration/Requests/GroupTypeRequestTest.php
+++ b/tests/Integration/Requests/GroupTypeRequestTest.php
@@ -3,7 +3,7 @@
 namespace CTApi\Test\Integration\Requests;
 
 use CTApi\Exceptions\CTRequestException;
-use CTApi\Models\Groups\Group\GroupTypeRequest;
+use CTApi\Models\Groups\GroupType\GroupTypeRequest;
 use CTApi\Test\Integration\IntegrationTestData;
 use CTApi\Test\Integration\TestCaseAuthenticated;
 
diff --git a/tests/Integration/Requests/GroupTypeRoleRequestTest.php b/tests/Integration/Requests/GroupTypeRoleRequestTest.php
index 5c1de31e..1a40eb94 100644
--- a/tests/Integration/Requests/GroupTypeRoleRequestTest.php
+++ b/tests/Integration/Requests/GroupTypeRoleRequestTest.php
@@ -3,7 +3,7 @@
 namespace CTApi\Test\Integration\Requests;
 
 use CTApi\CTLog;
-use CTApi\Models\Groups\Group\GroupType;
+use CTApi\Models\Groups\GroupType\GroupType;
 use CTApi\Models\Groups\GroupTypeRole\GroupTypeRole;
 use CTApi\Models\Groups\GroupTypeRole\GroupTypeRoleRequest;
 use CTApi\Test\Integration\IntegrationTestData;
diff --git a/tests/Unit/Docs/GroupTypeRequestTest.php b/tests/Unit/Docs/GroupTypeRequestTest.php
index 7d73cf1c..c4f3c5e5 100644
--- a/tests/Unit/Docs/GroupTypeRequestTest.php
+++ b/tests/Unit/Docs/GroupTypeRequestTest.php
@@ -2,8 +2,8 @@
 
 namespace CTApi\Test\Unit\Docs;
 
-use CTApi\Models\Groups\Group\GroupType;
-use CTApi\Models\Groups\Group\GroupTypeRequest;
+use CTApi\Models\Groups\GroupType\GroupType;
+use CTApi\Models\Groups\GroupType\GroupTypeRequest;
 use CTApi\Test\Unit\TestCaseHttpMocked;
 
 class GroupTypeRequestTest extends TestCaseHttpMocked