diff --git a/tests/codeception/api/functional/OauthAccessTokenCest.php b/tests/codeception/api/functional/oauth/AccessTokenCest.php
similarity index 97%
rename from tests/codeception/api/functional/OauthAccessTokenCest.php
rename to tests/codeception/api/functional/oauth/AccessTokenCest.php
index 797bf1f..57c163a 100644
--- a/tests/codeception/api/functional/OauthAccessTokenCest.php
+++ b/tests/codeception/api/functional/oauth/AccessTokenCest.php
@@ -1,11 +1,12 @@
 <?php
-namespace tests\codeception\api;
+namespace tests\codeception\api\oauth;
 
 use common\models\OauthScope as S;
 use tests\codeception\api\_pages\OauthRoute;
 use tests\codeception\api\functional\_steps\OauthSteps;
+use tests\codeception\api\FunctionalTester;
 
-class OauthAccessTokenCest {
+class AccessTokenCest {
 
     /**
      * @var OauthRoute
diff --git a/tests/codeception/api/functional/OauthAuthCodeCest.php b/tests/codeception/api/functional/oauth/AuthCodeCest.php
similarity index 98%
rename from tests/codeception/api/functional/OauthAuthCodeCest.php
rename to tests/codeception/api/functional/oauth/AuthCodeCest.php
index 55ac48b..04b7d43 100644
--- a/tests/codeception/api/functional/OauthAuthCodeCest.php
+++ b/tests/codeception/api/functional/oauth/AuthCodeCest.php
@@ -1,10 +1,11 @@
 <?php
-namespace tests\codeception\api;
+namespace tests\codeception\api\oauth;
 
 use common\models\OauthScope as S;
 use tests\codeception\api\_pages\OauthRoute;
+use tests\codeception\api\FunctionalTester;
 
-class OauthAuthCodeCest {
+class AuthCodeCest {
 
     /**
      * @var OauthRoute
diff --git a/tests/codeception/api/functional/OauthClientCredentialsGrantCest.php b/tests/codeception/api/functional/oauth/ClientCredentialsCest.php
similarity index 97%
rename from tests/codeception/api/functional/OauthClientCredentialsGrantCest.php
rename to tests/codeception/api/functional/oauth/ClientCredentialsCest.php
index e27ccbb..2286c48 100644
--- a/tests/codeception/api/functional/OauthClientCredentialsGrantCest.php
+++ b/tests/codeception/api/functional/oauth/ClientCredentialsCest.php
@@ -1,11 +1,12 @@
 <?php
-namespace tests\codeception\api;
+namespace tests\codeception\api\oauth;
 
 use common\models\OauthScope as S;
 use tests\codeception\api\_pages\OauthRoute;
 use tests\codeception\api\functional\_steps\OauthSteps;
+use tests\codeception\api\FunctionalTester;
 
-class OauthClientCredentialsGrantCest {
+class ClientCredentialsCest {
 
     /**
      * @var OauthRoute
diff --git a/tests/codeception/api/functional/OauthRefreshTokenCest.php b/tests/codeception/api/functional/oauth/RefreshTokenCest.php
similarity index 97%
rename from tests/codeception/api/functional/OauthRefreshTokenCest.php
rename to tests/codeception/api/functional/oauth/RefreshTokenCest.php
index 7e13680..7990af6 100644
--- a/tests/codeception/api/functional/OauthRefreshTokenCest.php
+++ b/tests/codeception/api/functional/oauth/RefreshTokenCest.php
@@ -1,11 +1,12 @@
 <?php
-namespace tests\codeception\api;
+namespace tests\codeception\api\oauth;
 
 use common\models\OauthScope as S;
 use tests\codeception\api\_pages\OauthRoute;
 use tests\codeception\api\functional\_steps\OauthSteps;
+use tests\codeception\api\FunctionalTester;
 
-class OauthRefreshTokenCest {
+class RefreshTokenCest {
 
     /**
      * @var OauthRoute