diff --git a/src/Api/Actions/Groups/IndexAction.php b/src/Api/Actions/Groups/IndexAction.php
index c82460647..3326be049 100644
--- a/src/Api/Actions/Groups/IndexAction.php
+++ b/src/Api/Actions/Groups/IndexAction.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Api\Actions\Groups;
 
-use Flarum\Core\Users\Group;
+use Flarum\Core\Groups\Group;
 use Flarum\Api\Actions\SerializeCollectionAction;
 use Flarum\Api\JsonApiRequest;
 use Tobscure\JsonApi\Document;
diff --git a/src/Core/Users/Group.php b/src/Core/Groups/Group.php
similarity index 94%
rename from src/Core/Users/Group.php
rename to src/Core/Groups/Group.php
index e5f0559f4..a4f010f6e 100755
--- a/src/Core/Users/Group.php
+++ b/src/Core/Groups/Group.php
@@ -1,4 +1,4 @@
-<?php namespace Flarum\Core\Users;
+<?php namespace Flarum\Core\Groups;
 
 use Flarum\Core\Model;
 
diff --git a/src/Core/Users/Guest.php b/src/Core/Users/Guest.php
index 2a6344d3c..f021b9226 100755
--- a/src/Core/Users/Guest.php
+++ b/src/Core/Users/Guest.php
@@ -1,5 +1,7 @@
 <?php namespace Flarum\Core\Users;
 
+use Flarum\Core\Groups\Group;
+
 class Guest extends User
 {
     /**
diff --git a/src/Core/Users/User.php b/src/Core/Users/User.php
index 272c5c29b..3e59e457f 100755
--- a/src/Core/Users/User.php
+++ b/src/Core/Users/User.php
@@ -1,5 +1,6 @@
 <?php namespace Flarum\Core\Users;
 
+use Flarum\Core\Groups\Group;
 use Flarum\Core\Model;
 use Flarum\Core\Notifications\Notification;
 use Illuminate\Contracts\Hashing\Hasher;
@@ -487,7 +488,7 @@ class User extends Model
      */
     public function groups()
     {
-        return $this->belongsToMany('Flarum\Core\Users\Group', 'users_groups');
+        return $this->belongsToMany('Flarum\Core\Groups\Group', 'users_groups');
     }
 
     /**