diff --git a/src/Http/Controllers/AuthController.php b/src/Http/Controllers/AuthController.php
deleted file mode 100644
index d5b0b448..00000000
--- a/src/Http/Controllers/AuthController.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Http\Controllers;
-
-use Binaryk\LaravelRestify\Services\AuthService;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Controller;
-
-class AuthController extends Controller
-{
-    private AuthService $authService;
-
-    public function __construct(AuthService $authService)
-    {
-        $this->authService = $authService;
-    }
-
-    public function login(Request $request)
-    {
-        return $this->authService->login($request);
-    }
-
-    public function register(Request $request)
-    {
-        return $this->authService->register($request);
-    }
-
-    public function verify(Request $request, $id, $hash = null)
-    {
-        return $this->authService->verify($request, $id, $hash);
-    }
-
-    public function forgotPassword(Request $request)
-    {
-        return $this->authService->forgotPassword($request);
-    }
-
-    public function resetPassword(Request $request)
-    {
-        return $this->authService->resetPassword($request);
-    }
-}
diff --git a/src/Services/AuthService.php b/src/Services/AuthService.php
deleted file mode 100644
index 24871994..00000000
--- a/src/Services/AuthService.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-use Binaryk\LaravelRestify\Contracts\Sanctumable;
-use Binaryk\LaravelRestify\Exceptions\Eloquent\EntityNotFoundException;
-use Binaryk\LaravelRestify\Exceptions\SanctumUserException;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\Events\Verified;
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Illuminate\Contracts\Auth\PasswordBroker;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Password;
-use ReflectionException;
-
-class AuthService
-{
-    public function login(Request $request)
-    {
-        if (config('restify.auth.provider') !== 'sanctum') {
-            throw SanctumUserException::wrongConfiguration();
-        }
-
-        $token = LoginService::make($request);
-
-        return $token;
-    }
-
-    public function register(Request $request)
-    {
-        return RegisterService::make($request, $this);
-    }
-
-    public function forgotPassword(Request $request, string $url = null)
-    {
-        return ForgotPasswordService::make($request, $url);
-    }
-
-    /*
-     * @param $id
-     * @param null $hash
-     * @return Builder|Builder[]|\Illuminate\Database\Eloquent\Collection|Model|null
-     * @throws AuthorizationException
-     * @throws EntityNotFoundException
-     */
-    public function verify(Request $request, $id, $hash = null)
-    {
-        /**
-         * @var Authenticatable
-         */
-        $user = $this->userQuery()->query()->findOrFail($id);
-
-        if ($user instanceof Sanctumable && ! hash_equals((string) $hash, sha1($user->getEmailForVerification()))) {
-            throw new AuthorizationException('Invalid hash');
-        }
-
-        if ($user instanceof MustVerifyEmail && $user->markEmailAsVerified()) {
-            event(new Verified($user));
-        }
-
-        return $user;
-    }
-
-    public function resetPassword(Request $request)
-    {
-        return ResetPasswordService::make($request, $this);
-    }
-
-    /**
-     * @return PasswordBroker
-     */
-    public function broker()
-    {
-        return Password::broker();
-    }
-
-    /**
-     * Returns query for User model and validate if it exists.
-     *
-     * @return Model
-     * @throws SanctumUserException
-     * @throws EntityNotFoundException
-     */
-    public function userQuery()
-    {
-        $userClass = Config::get('auth.providers.users.model');
-
-        try {
-            $container = Container::getInstance();
-            $userInstance = $container->make($userClass);
-            $this->validateUserModel($userInstance);
-
-            return $userInstance;
-        } catch (BindingResolutionException $e) {
-            throw new EntityNotFoundException("The model $userClass from he follow configuration -> 'auth.providers.users.model' cannot be instantiated (may be an abstract class).", $e->getCode(), $e);
-        } catch (ReflectionException $e) {
-            throw new EntityNotFoundException("The model from the follow configuration -> 'auth.providers.users.model' doesn't exists.", $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * @param $userInstance
-     * @throws SanctumUserException
-     */
-    public function validateUserModel($userInstance)
-    {
-        if (config('restify.auth.provider') === 'sanctum' && false === $userInstance instanceof Sanctumable) {
-            throw new SanctumUserException(__("User is not implementing Binaryk\LaravelRestify\Contracts\Sanctumable contract. User should use 'Laravel\Sanctum\HasApiTokens' trait to provide"));
-        }
-    }
-
-    public function logout(Request $request)
-    {
-        return LogoutService::make($request);
-    }
-}
diff --git a/src/Services/Concerns/AuthenticatesUsers.php b/src/Services/Concerns/AuthenticatesUsers.php
deleted file mode 100644
index 98d42249..00000000
--- a/src/Services/Concerns/AuthenticatesUsers.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services\Concerns;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\ValidationException;
-
-trait AuthenticatesUsers
-{
-    use ThrottlesLogins;
-
-    /**
-     * Get the post register / login redirect path.
-     *
-     * @return string
-     */
-    public function redirectPath()
-    {
-        if (method_exists($this, 'redirectTo')) {
-            return $this->redirectTo();
-        }
-
-        return property_exists($this, 'redirectTo') ? $this->redirectTo : '/home';
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validateLogin($request);
-
-        // If the class is using the ThrottlesLogins trait, we can automatically throttle
-        // the login attempts for this application. We'll key this by the username and
-        // the IP address of the client making these requests into this application.
-        if ($this->hasTooManyLoginAttempts($request)) {
-            $this->fireLockoutEvent($request);
-
-            return $this->sendLockoutResponse($request);
-        }
-
-        if ($this->attemptLogin($request)) {
-            return $this->sendLoginResponse($request);
-        }
-
-        // If the login attempt was unsuccessful we will increment the number of attempts
-        // to login and redirect the user back to the login form. Of course, when this
-        // user surpasses their maximum number of attempts they will get locked out.
-        $this->incrementLoginAttempts($request);
-
-        return $this->sendFailedLoginResponse($request);
-    }
-
-    /**
-     * Validate the user login request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return void
-     */
-    protected function validateLogin(Request $request)
-    {
-        $request->validate([
-            $this->username() => 'required|string',
-            'password' => 'required|string',
-        ]);
-    }
-
-    /**
-     * Attempt to log the user into the application.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return bool
-     */
-    protected function attemptLogin(Request $request)
-    {
-        return $this->guard()->attempt(
-            $this->credentials($request),
-            $request->has('remember')
-        );
-    }
-
-    /**
-     * Get the needed authorization credentials from the request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    protected function credentials(Request $request)
-    {
-        return $request->only($this->username(), 'password');
-    }
-
-    /**
-     * Send the response after the user was authenticated.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
-     */
-    protected function sendLoginResponse(Request $request)
-    {
-        $request->session()->regenerate();
-
-        $this->clearLoginAttempts($request);
-
-        return $this->authenticated($request, $this->guard()->user())
-            ?: redirect()->intended($this->redirectPath());
-    }
-
-    /**
-     * The user has been authenticated.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param mixed $user
-     * @return mixed
-     */
-    protected function authenticated(Request $request, $user)
-    {
-        //
-    }
-
-    /**
-     * Get the failed login response instance.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendFailedLoginResponse(Request $request)
-    {
-        throw ValidationException::withMessages([
-            $this->username() => [trans('auth.failed')],
-        ]);
-    }
-
-    /**
-     * Get the login username to be used by the controller.
-     *
-     * @return string
-     */
-    public function username()
-    {
-        return 'email';
-    }
-
-    /**
-     * Log the user out of the application.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function logout(Request $request)
-    {
-        $this->guard()->logout();
-
-        $request->session()->invalidate();
-
-        return redirect('/');
-    }
-
-    /**
-     * Get the guard to be used during authentication.
-     *
-     * @return \Illuminate\Contracts\Auth\StatefulGuard
-     */
-    protected function guard()
-    {
-        return Auth::guard();
-    }
-}
diff --git a/src/Services/Concerns/ResetsPasswords.php b/src/Services/Concerns/ResetsPasswords.php
deleted file mode 100644
index a0ca6582..00000000
--- a/src/Services/Concerns/ResetsPasswords.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services\Concerns;
-
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Str;
-
-trait ResetsPasswords
-{
-    /**
-     * Get the post register / login redirect path.
-     *
-     * @return string
-     */
-    public function redirectPath()
-    {
-        if (method_exists($this, 'redirectTo')) {
-            return $this->redirectTo();
-        }
-
-        return property_exists($this, 'redirectTo') ? $this->redirectTo : '/home';
-    }
-
-    /**
-     * Display the password reset view for the given token.
-     *
-     * If no token is present, display the link request form.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string|null $token
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showResetForm(Request $request, $token = null)
-    {
-        return view('auth.passwords.reset')->with(
-            ['token' => $token, 'email' => $request->email]
-        );
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function reset(Request $request)
-    {
-        $request->validate($this->rules(), $this->validationErrorMessages());
-
-        // Here we will attempt to reset the user's password. If it is successful we
-        // will update the password on an actual user model and persist it to the
-        // database. Otherwise we will parse the error and return the response.
-        $response = $this->broker()->reset(
-            $this->credentials($request),
-            function ($user, $password) {
-                $this->resetPassword($user, $password);
-            }
-        );
-
-        // If the password was successfully reset, we will redirect the user back to
-        // the application's home authenticated view. If there is an error we can
-        // redirect them back to where they came from with their error message.
-        return $response == Password::PASSWORD_RESET
-            ? $this->sendResetResponse($response)
-            : $this->sendResetFailedResponse($request, $response);
-    }
-
-    /**
-     * Get the password reset validation rules.
-     *
-     * @return array
-     */
-    protected function rules()
-    {
-        return [
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => 'required|confirmed|min:6',
-        ];
-    }
-
-    /**
-     * Get the password reset validation error messages.
-     *
-     * @return array
-     */
-    protected function validationErrorMessages()
-    {
-        return [];
-    }
-
-    /**
-     * Get the password reset credentials from the request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    protected function credentials(Request $request)
-    {
-        return $request->only(
-            'email',
-            'password',
-            'password_confirmation',
-            'token'
-        );
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param \Illuminate\Contracts\Auth\CanResetPassword $user
-     * @param string $password
-     * @return void
-     */
-    protected function resetPassword($user, $password)
-    {
-        $user->password = Hash::make($password);
-
-        $user->setRememberToken(Str::random(60));
-
-        $user->save();
-
-        event(new PasswordReset($user));
-
-        $this->guard()->login($user);
-    }
-
-    /**
-     * Get the response for a successful password reset.
-     *
-     * @param string $response
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendResetResponse($response)
-    {
-        return response()->json([
-            'status' => trans($response),
-        ]);
-    }
-
-    /**
-     * Get the response for a failed password reset.
-     *
-     * @param \Illuminate\Http\Request
-     * @param string $response
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendResetFailedResponse(Request $request, $response)
-    {
-        return response()->json(['email' => [
-            trans($response),
-        ]])->setStatusCode(400);
-    }
-
-    /**
-     * Get the broker to be used during password reset.
-     *
-     * @return \Illuminate\Contracts\Auth\PasswordBroker
-     */
-    public function broker()
-    {
-        return Password::broker();
-    }
-
-    /**
-     * Get the guard to be used during password reset.
-     *
-     * @return \Illuminate\Contracts\Auth\StatefulGuard
-     */
-    protected function guard()
-    {
-        return Auth::guard();
-    }
-}
diff --git a/src/Services/Concerns/ThrottlesLogins.php b/src/Services/Concerns/ThrottlesLogins.php
deleted file mode 100644
index 6ff6de98..00000000
--- a/src/Services/Concerns/ThrottlesLogins.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services\Concerns;
-
-use Illuminate\Auth\Events\Lockout;
-use Illuminate\Cache\RateLimiter;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-
-trait ThrottlesLogins
-{
-    /**
-     * Determine if the user has too many failed login attempts.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return bool
-     */
-    protected function hasTooManyLoginAttempts(Request $request)
-    {
-        return $this->limiter()->tooManyAttempts(
-            $this->throttleKey($request),
-            $this->maxAttempts(),
-            $this->decayMinutes()
-        );
-    }
-
-    /**
-     * Increment the login attempts for the user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     */
-    protected function incrementLoginAttempts(Request $request)
-    {
-        $this->limiter()->hit($this->throttleKey($request));
-    }
-
-    /**
-     * Redirect the user after determining they are locked out.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    protected function sendLockoutResponse(Request $request)
-    {
-        $seconds = $this->limiter()->availableIn(
-            $this->throttleKey($request)
-        );
-
-        throw ValidationException::withMessages([
-            $this->username() => [Lang::get('auth.throttle', ['seconds' => $seconds])],
-        ])->status(423);
-    }
-
-    /**
-     * Clear the login locks for the given user credentials.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     */
-    protected function clearLoginAttempts(Request $request)
-    {
-        $this->limiter()->clear($this->throttleKey($request));
-    }
-
-    /**
-     * Fire an event when a lockout occurs.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     */
-    protected function fireLockoutEvent(Request $request)
-    {
-        event(new Lockout($request));
-    }
-
-    /**
-     * Get the throttle key for the given request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string
-     */
-    protected function throttleKey(Request $request)
-    {
-        return Str::lower($request->input($this->username())).'|'.$request->ip();
-    }
-
-    /**
-     * Get the rate limiter instance.
-     *
-     * @return \Illuminate\Cache\RateLimiter
-     */
-    protected function limiter()
-    {
-        return app(RateLimiter::class);
-    }
-
-    /**
-     * Get the maximum number of attempts to allow.
-     *
-     * @return int
-     */
-    public function maxAttempts()
-    {
-        return property_exists($this, 'maxAttempts') ? $this->maxAttempts : 5;
-    }
-
-    /**
-     * Get the number of minutes to throttle for.
-     *
-     * @return int
-     */
-    public function decayMinutes()
-    {
-        return property_exists($this, 'decayMinutes') ? $this->decayMinutes : 1;
-    }
-}
diff --git a/src/Services/ForgotPasswordService.php b/src/Services/ForgotPasswordService.php
deleted file mode 100644
index c324d091..00000000
--- a/src/Services/ForgotPasswordService.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-use Illuminate\Auth\Notifications\ResetPassword;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Password;
-
-class ForgotPasswordService
-{
-    public static function make(Request $request, string $url = null)
-    {
-        ResetPassword::createUrlUsing(function ($notifiable, $token) use ($url) {
-            $withToken = str_replace(['{token}'], $token, $url ?? config('restify.auth.password_reset_url'));
-            $withEmail = str_replace(['{email}'], $notifiable->getEmailForPasswordReset(), $withToken);
-
-            return url($withEmail);
-        });
-
-        return resolve(static::class)->sendResetLinkEmail($request);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sendResetLinkEmail(Request $request)
-    {
-        $request->validate(['email' => 'required|email']);
-
-        // We will send the password reset link to this user. Once we have attempted
-        // to send the link, we will examine the response then see the message we
-        // need to show to the user. Finally, we'll send out a proper response.
-        $response = $this->broker()->sendResetLink(
-            $request->only('email')
-        );
-
-        return $response == Password::RESET_LINK_SENT
-            ? $this->sendResetLinkResponse($response)
-            : $this->sendResetLinkFailedResponse($request, $response);
-    }
-
-    public function broker()
-    {
-        return Password::broker();
-    }
-
-    /**
-     * Get the response for a successful password reset link.
-     *
-     * @param string $response
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendResetLinkResponse($response)
-    {
-        return response()->json([
-            'status' => trans($response),
-        ]);
-    }
-
-    /**
-     * Get the response for a failed password reset link.
-     *
-     * @param \Illuminate\Http\Request
-     * @param string $response
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendResetLinkFailedResponse(Request $request, $response)
-    {
-        return response()->json([
-            'errors' => [
-                'email' => [
-                    trans($response),
-                ],
-            ],
-        ])->setStatusCode(400);
-    }
-}
diff --git a/src/Services/LoginService.php b/src/Services/LoginService.php
deleted file mode 100644
index 5d2dd415..00000000
--- a/src/Services/LoginService.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-use Binaryk\LaravelRestify\Events\UserLoggedIn;
-use Binaryk\LaravelRestify\Services\Concerns\AuthenticatesUsers;
-use Illuminate\Http\Request;
-
-class LoginService
-{
-    use AuthenticatesUsers;
-
-    public static function make(Request $request)
-    {
-        return resolve(static::class)->login($request);
-    }
-
-    public function login(Request $request)
-    {
-        $this->validateLogin($request);
-
-        // If the class is using the ThrottlesLogins trait, we can automatically throttle
-        // the login attempts for this application. We'll key this by the username and
-        // the IP address of the client making these requests into this application.
-        if (method_exists($this, 'hasTooManyLoginAttempts') &&
-            $this->hasTooManyLoginAttempts($request)) {
-            $this->fireLockoutEvent($request);
-
-            return $this->sendLockoutResponse($request);
-        }
-
-        if ($this->attemptLogin($request)) {
-            event(new UserLoggedIn($this->guard()->user()));
-
-            return $this->guard()->user()->createToken('login');
-        }
-
-        // If the login attempt was unsuccessful we will increment the number of attempts
-        // to login and redirect the user back to the login form. Of course, when this
-        // user surpasses their maximum number of attempts they will get locked out.
-        $this->incrementLoginAttempts($request);
-
-        return $this->sendFailedLoginResponse($request);
-    }
-}
diff --git a/src/Services/LogoutService.php b/src/Services/LogoutService.php
deleted file mode 100644
index a9d68b3a..00000000
--- a/src/Services/LogoutService.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-use Binaryk\LaravelRestify\Exceptions\AuthenticatableUserException;
-use Binaryk\LaravelRestify\Services\Concerns\AuthenticatesUsers;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Foundation\Auth\User;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
-
-class LogoutService
-{
-    use AuthenticatesUsers;
-
-    public static function make(Request $request): Response
-    {
-        /** * @var User */
-        $user = Auth::user();
-
-        if ($user instanceof Authenticatable) {
-            return resolve(static::class)->logout($request);
-        }
-
-        throw new AuthenticatableUserException(__('User is not authenticated.'));
-    }
-}
diff --git a/src/Services/RegisterService.php b/src/Services/RegisterService.php
deleted file mode 100644
index 52a657f4..00000000
--- a/src/Services/RegisterService.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-use Binaryk\LaravelRestify\Exceptions\AuthenticatableUserException;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRegisterRequest;
-use Closure;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
-use ReflectionException;
-
-class RegisterService
-{
-    /**
-     * @var AuthService
-     */
-    protected $authService;
-
-    /**
-     * The callback that should be used to create the registered user.
-     *
-     * @var Closure|null
-     */
-    public static $creating;
-
-    public static $registerFormRequest = RestifyRegisterRequest::class;
-
-    public function register(Request $request)
-    {
-        $payload = $request->all();
-
-        $this->validateRegister($payload);
-
-        $builder = $this->authService->userQuery();
-
-        if (false === $builder instanceof Authenticatable) {
-            throw AuthenticatableUserException::wrongInstance();
-        }
-
-        $userData = array_merge($payload, [
-            'password' => Hash::make(data_get($payload, 'password')),
-        ]);
-
-        if (is_callable(static::$creating)) {
-            $user = call_user_func(static::$creating, $userData);
-        } else {
-            $user = $builder->query()->create($userData);
-        }
-
-        if ($user instanceof Authenticatable) {
-            event(new Registered($user));
-        }
-
-        return $user;
-    }
-
-    public static function make(Request $request, AuthService $authService)
-    {
-        return resolve(static::class)
-            ->usingAuthService($authService)
-            ->register($request);
-    }
-
-    public function validateRegister(array $payload)
-    {
-        try {
-            if (class_exists(static::$registerFormRequest) && (new \ReflectionClass(static::$registerFormRequest))->isInstantiable()) {
-                $validator = Validator::make($payload, (new static::$registerFormRequest)->rules(), (new static::$registerFormRequest)->messages());
-                if ($validator->fails()) {
-                    throw new ValidationException($validator);
-                }
-            }
-        } catch (ReflectionException $e) {
-            $concrete = static::$registerFormRequest;
-
-            throw new BindingResolutionException("Target class [$concrete] does not exist.", 0, $e);
-        }
-
-        return true;
-    }
-
-    protected function usingAuthService(AuthService $service)
-    {
-        $this->authService = $service;
-
-        return $this;
-    }
-}
diff --git a/src/Services/ResetPasswordService.php b/src/Services/ResetPasswordService.php
deleted file mode 100644
index 0bbf5acd..00000000
--- a/src/Services/ResetPasswordService.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-use Binaryk\LaravelRestify\Services\Concerns\ResetsPasswords;
-use Illuminate\Http\Request;
-
-class ResetPasswordService
-{
-    use ResetsPasswords;
-
-    protected $authService;
-
-    public static function make(Request $request, AuthService $authService)
-    {
-        return resolve(static::class)
-            ->reset($request);
-    }
-
-    protected function usingAuthService(AuthService $authService)
-    {
-        $this->authService = $authService;
-
-        return $this;
-    }
-}
diff --git a/src/Services/RestifyService.php b/src/Services/RestifyService.php
deleted file mode 100644
index c05612bd..00000000
--- a/src/Services/RestifyService.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Services;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class RestifyService
-{
-}
diff --git a/tests/Feature/Authentication/AuthServiceForgotPasswordTest.php b/tests/Feature/Authentication/AuthServiceForgotPasswordTest.php
deleted file mode 100644
index 93cf51a8..00000000
--- a/tests/Feature/Authentication/AuthServiceForgotPasswordTest.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
-
-use Binaryk\LaravelRestify\Events\UserLoggedIn;
-use Binaryk\LaravelRestify\Services\AuthService;
-use Binaryk\LaravelRestify\Services\RegisterService;
-use Binaryk\LaravelRestify\Tests\Fixtures\MailTracking;
-use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
-use Binaryk\LaravelRestify\Tests\IntegrationTest;
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Auth\Notifications\ResetPassword;
-use Illuminate\Foundation\Testing\Concerns\InteractsWithContainer;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Notification;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class AuthServiceForgotPasswordTest extends IntegrationTest
-{
-    use MailTracking;
-    use InteractsWithContainer;
-
-    /**
-     * @var AuthService
-     */
-    protected $authService;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->setUpMailTracking();
-        RegisterService::$registerFormRequest = null;
-        $this->authService = resolve(AuthService::class);
-        $this->app['config']->set('restify.auth.provider', 'sanctum');
-        $this->app['config']->set('restify.auth.frontend_app_url', 'https://laravel-restify.dev');
-        $this->app['config']->set('restify.auth.password_reset_url', 'https://laravel-restify.dev/password/reset?token={token}&email={email}');
-    }
-
-    public function test_email_was_sent_and_contain_token()
-    {
-        Notification::fake();
-
-        $user = $this->register();
-        $request = new Request([], []);
-        $request->merge(['email' => $user->email]);
-
-        $this->authService->forgotPassword($request);
-
-        Notification::assertSentTo($user, ResetPassword::class, function ($notification) {
-            $this->assertNotEmpty($notification->token);
-
-            return true;
-        });
-    }
-
-    public function test_email_was_sent_and_has_default_or_custom_url_callback()
-    {
-        Notification::fake();
-
-        $user = $this->register();
-        $request = new Request([], []);
-        $request->merge(['email' => $user->email]);
-
-        $this->authService->forgotPassword($request);
-
-        Notification::assertSentTo($user, ResetPassword::class, function ($notification) use ($user) {
-            $this->assertEquals(
-                "https://laravel-restify.dev/password/reset?token={$notification->token}&email={$user->email}",
-                call_user_func($notification::$createUrlCallback, $user, $notification->token),
-            );
-
-            return true;
-        });
-
-        $this->authService->forgotPassword(
-            $request,
-            'https://subdomain.domain.test/password/reset?token={token}&email={email}',
-        );
-
-        Notification::assertSentTo($user, ResetPassword::class, function ($notification) use ($user) {
-            $this->assertEquals(
-                "https://subdomain.domain.test/password/reset?token={$notification->token}&email={$user->email}",
-                call_user_func($notification::$createUrlCallback, $user, $notification->token),
-            );
-
-            return true;
-        });
-    }
-
-    public function test_reset_password_invalid_payload()
-    {
-        $this->expectException(ValidationException::class);
-        $request = new Request([], []);
-        $request->merge([
-            'email' => null,
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'token' => 'secret',
-        ]);
-        $this->authService->resetPassword($request);
-    }
-
-    public function test_reset_password_successfully()
-    {
-        Notification::fake();
-        $user = $this->register();
-
-        $request = new Request([], []);
-        $request->merge(['email' => $user->email]);
-        $this->authService->verify($request, $user->id, sha1($user->email));
-
-        $this->authService->forgotPassword($request);
-
-        Notification::assertSentTo($user, ResetPassword::class, function ($notification) use ($user) {
-            $token = $notification->token;
-            $password = Str::random(10);
-
-            $request = new Request([], []);
-            $request->merge([
-                'email' => $user->email,
-                'password' => $password,
-                'password_confirmation' => $password,
-                'token' => $token,
-            ]);
-
-            $this->authService->resetPassword($request);
-
-            Event::assertDispatched(PasswordReset::class, function ($e) use ($user) {
-                $this->assertEquals($e->user->email, $user->email);
-
-                return $e->user instanceof User;
-            });
-
-            $request = new Request([], []);
-            $request->merge([
-                'email' => $user->email,
-                'password' => $password,
-            ]);
-
-            $this->authService->login($request);
-
-            Event::assertDispatched(UserLoggedIn::class, function ($e) use ($user) {
-                $this->assertEquals($e->user->email, $user->email);
-
-                return $e->user instanceof User;
-            });
-
-            return true;
-        });
-    }
-
-    public function register()
-    {
-        Event::fake([
-            Registered::class,
-            PasswordReset::class,
-            UserLoggedIn::class,
-        ]);
-
-        $this->app->instance(User::class, new User);
-
-        $request = new Request([], []);
-
-        $user = [
-            'name' => 'Eduard Lupacescu',
-            'email' => 'eduard.lupacescu@binarcode.com',
-            'password' => 'secret!',
-            'remember_token' => Str::random(10),
-        ];
-
-        $request->merge($user);
-
-        $this->authService->register($request);
-
-        return User::query()->get()->last();
-    }
-}
diff --git a/tests/Feature/Authentication/AuthServiceRegisterTest.php b/tests/Feature/Authentication/AuthServiceRegisterTest.php
deleted file mode 100644
index 3496cc28..00000000
--- a/tests/Feature/Authentication/AuthServiceRegisterTest.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
-
-use Binaryk\LaravelRestify\Exceptions\Eloquent\EntityNotFoundException;
-use Binaryk\LaravelRestify\Models\LaravelRestifyModel;
-use Binaryk\LaravelRestify\Services\AuthService;
-use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
-use Binaryk\LaravelRestify\Tests\IntegrationTest;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Auth\Events\Verified;
-use Illuminate\Foundation\Testing\Concerns\InteractsWithContainer;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Str;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class AuthServiceRegisterTest extends IntegrationTest
-{
-    use InteractsWithContainer;
-    /**
-     * @var AuthService
-     */
-    protected $authService;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->authService = resolve(AuthService::class);
-    }
-
-    public function test_user_query_throw_container_does_not_have_model_reflection_exception()
-    {
-        $this->app['config']->set('auth.providers.users.model', null);
-        $this->expectException(EntityNotFoundException::class);
-        $this->authService->userQuery();
-    }
-
-    public function test_user_query_throw_container_cannot_instantiate_abstract_model()
-    {
-        $this->app['config']->set('auth.providers.users.model', LaravelRestifyModel::class);
-        $this->expectException(EntityNotFoundException::class);
-        $this->authService->userQuery();
-    }
-
-    public function test_register_successfully()
-    {
-        Event::fake([
-            Registered::class,
-        ]);
-
-        $this->app->instance(User::class, new User);
-
-        $user = [
-            'name' => 'Eduard Lupacescu',
-            'email' => 'eduard.lupacescu@binarcode.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'remember_token' => Str::random(10),
-        ];
-
-        $request = new Request([], []);
-
-        $request->merge($user);
-
-        $this->authService->register($request);
-
-        Event::assertDispatched(Registered::class, function ($e) use ($user) {
-            $this->assertEquals($e->user->email, $user['email']);
-
-            return $e->user instanceof \Binaryk\LaravelRestify\Tests\Fixtures\User\User;
-        });
-
-        $lastUser = User::query()->get()->last();
-
-        $this->assertEquals($lastUser->email, $user['email']);
-    }
-
-    public function test_verify_user_throw_hash_not_match()
-    {
-        Event::fake([
-            Registered::class,
-        ]);
-
-        $this->app->instance(User::class, new User);
-
-        $user = [
-            'name' => 'Eduard Lupacescu',
-            'email' => 'eduard.lupacescu@binarcode.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'remember_token' => Str::random(10),
-        ];
-
-        $request = new Request([], []);
-
-        $request->merge($user);
-
-        $this->authService->register($request);
-        $lastUser = User::query()->get()->last();
-
-        $this->expectException(AuthorizationException::class);
-        $this->authService->verify($request, $lastUser->id, sha1('random@email.com'));
-    }
-
-    public function test_verify_user_successfully()
-    {
-        Event::fake([
-            Verified::class,
-            Registered::class,
-        ]);
-
-        $this->app->instance(User::class, new User);
-
-        $user = [
-            'name' => 'Eduard Lupacescu',
-            'email' => 'eduard.lupacescu@binarcode.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'remember_token' => Str::random(10),
-        ];
-
-        $request = new Request([], []);
-
-        $request->merge($user);
-
-        $this->authService->register($request);
-        $lastUser = User::query()->get()->last();
-
-        $this->assertNull($lastUser->email_verified_at);
-        $this->authService->verify($request, $lastUser->id, sha1('eduard.lupacescu@binarcode.com'));
-        $lastUser->refresh();
-        $this->assertNotNull($lastUser->email_verified_at);
-        Event::assertDispatched(Verified::class, function ($e) use ($user) {
-            $this->assertEquals($e->user->email, $user['email']);
-
-            return $e->user instanceof \Binaryk\LaravelRestify\Tests\Fixtures\User\User;
-        });
-    }
-}
diff --git a/tests/Feature/Authentication/ResetPasswordRequestTest.php b/tests/Feature/Authentication/ResetPasswordRequestTest.php
deleted file mode 100644
index 97552355..00000000
--- a/tests/Feature/Authentication/ResetPasswordRequestTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
-
-use Binaryk\LaravelRestify\Http\Requests\ResetPasswordRequest;
-use Binaryk\LaravelRestify\Tests\IntegrationTest;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class ResetPasswordRequestTest extends IntegrationTest
-{
-    /** @var ResetPasswordRequest */
-    private $subject;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->subject = new ResetPasswordRequest;
-    }
-
-    public function testRules()
-    {
-        $this->assertEquals(
-            [
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => 'required|confirmed|min:8',
-        ],
-            $this->subject->rules()
-        );
-    }
-
-    public function testAuthorize()
-    {
-        $this->assertTrue($this->subject->authorize());
-    }
-}
diff --git a/tests/Feature/Authentication/RestifyLoginRequestTest.php b/tests/Feature/Authentication/RestifyLoginRequestTest.php
deleted file mode 100644
index 1d609a85..00000000
--- a/tests/Feature/Authentication/RestifyLoginRequestTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
-
-use Binaryk\LaravelRestify\Http\Requests\RestifyLoginRequest;
-use Binaryk\LaravelRestify\Tests\IntegrationTest;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class RestifyLoginRequestTest extends IntegrationTest
-{
-    /** @var RestifyLoginRequest */
-    private $subject;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->subject = new RestifyLoginRequest;
-    }
-
-    public function testRules()
-    {
-        $this->assertEquals(
-            [
-            'email' => 'required|email',
-            'password' => 'required|min:6',
-        ],
-            $this->subject->rules()
-        );
-    }
-
-    public function testAuthorize()
-    {
-        $this->assertTrue($this->subject->authorize());
-    }
-}
diff --git a/tests/Feature/Authentication/RestifyPasswordEmailRequestTest.php b/tests/Feature/Authentication/RestifyPasswordEmailRequestTest.php
deleted file mode 100644
index 600767d1..00000000
--- a/tests/Feature/Authentication/RestifyPasswordEmailRequestTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
-
-use Binaryk\LaravelRestify\Http\Requests\RestifyPasswordEmailRequest;
-use Binaryk\LaravelRestify\Tests\IntegrationTest;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class RestifyPasswordEmailRequestTest extends IntegrationTest
-{
-    /** @var RestifyPasswordEmailRequest */
-    private $subject;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->subject = new RestifyPasswordEmailRequest;
-    }
-
-    public function testRules()
-    {
-        $this->assertEquals(
-            [
-            'email' => 'required|email',
-        ],
-            $this->subject->rules()
-        );
-    }
-
-    public function testAuthorize()
-    {
-        $this->assertTrue($this->subject->authorize());
-    }
-}