diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a9b0599..2d0db27 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -5,6 +5,3 @@ parameters:
 
         - message: '#Part \$routePrefix \(mixed\) of encapsed string cannot be cast to string\.#'
           path: routes/blog-api.php
-
-    excludePaths:
-        - src/Http/Controllers/Base/*.php
diff --git a/src/Http/Controllers/Base/BaseCategoryController.php b/src/Http/Controllers/Base/BaseCategoryController.php
deleted file mode 100644
index c9b0252..0000000
--- a/src/Http/Controllers/Base/BaseCategoryController.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace CSlant\Blog\Api\Http\Controllers\Base;
-
-use Botble\Blog\Http\Controllers\API\CategoryController as BotbleCategoryController;
-
-class BaseCategoryController extends BotbleCategoryController
-{
-}
diff --git a/src/Http/Controllers/Base/BasePostController.php b/src/Http/Controllers/Base/BasePostController.php
deleted file mode 100644
index 1f887ab..0000000
--- a/src/Http/Controllers/Base/BasePostController.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace CSlant\Blog\Api\Http\Controllers\Base;
-
-use Botble\Blog\Http\Controllers\API\PostController as BotblePostController;
-
-class BasePostController extends BotblePostController
-{
-}
diff --git a/src/Http/Controllers/Base/BaseTagController.php b/src/Http/Controllers/Base/BaseTagController.php
deleted file mode 100644
index 6ae828f..0000000
--- a/src/Http/Controllers/Base/BaseTagController.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace CSlant\Blog\Api\Http\Controllers\Base;
-
-use Botble\Blog\Http\Controllers\API\TagController as BotbleTagController;
-
-class BaseTagController extends BotbleTagController
-{
-}
diff --git a/src/Http/Controllers/CategoryController.php b/src/Http/Controllers/CategoryController.php
index cc264d4..c2e5a2c 100644
--- a/src/Http/Controllers/CategoryController.php
+++ b/src/Http/Controllers/CategoryController.php
@@ -2,7 +2,7 @@
 
 namespace CSlant\Blog\Api\Http\Controllers;
 
-use CSlant\Blog\Api\Http\Controllers\Base\BaseCategoryController;
+use CSlant\Blog\Core\Http\Controllers\Base\BaseCategoryController;
 
 class CategoryController extends BaseCategoryController
 {
diff --git a/src/Http/Controllers/PostController.php b/src/Http/Controllers/PostController.php
index c5b6df8..82dc4db 100644
--- a/src/Http/Controllers/PostController.php
+++ b/src/Http/Controllers/PostController.php
@@ -2,7 +2,7 @@
 
 namespace CSlant\Blog\Api\Http\Controllers;
 
-use CSlant\Blog\Api\Http\Controllers\Base\BasePostController;
+use CSlant\Blog\Core\Http\Controllers\Base\BasePostController;
 
 class PostController extends BasePostController
 {
diff --git a/src/Http/Controllers/TagController.php b/src/Http/Controllers/TagController.php
index ff41648..7e9ed6b 100644
--- a/src/Http/Controllers/TagController.php
+++ b/src/Http/Controllers/TagController.php
@@ -2,7 +2,7 @@
 
 namespace CSlant\Blog\Api\Http\Controllers;
 
-use CSlant\Blog\Api\Http\Controllers\Base\BaseTagController;
+use CSlant\Blog\Core\Http\Controllers\Base\BaseTagController;
 
 class TagController extends BaseTagController
 {
diff --git a/src/Models/Traits/IsIncrementing.php b/src/Models/Traits/IsIncrementing.php
deleted file mode 100644
index 4ed88a2..0000000
--- a/src/Models/Traits/IsIncrementing.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace CSlant\Blog\Api\Models\Traits;
-
-trait IsIncrementing
-{
-    public $incrementing = true;
-}