diff --git a/app/controllers/CustomFieldsController.php b/app/controllers/admin/CustomFieldsController.php
similarity index 98%
rename from app/controllers/CustomFieldsController.php
rename to app/controllers/admin/CustomFieldsController.php
index dda99834ed..a08656d7b4 100644
--- a/app/controllers/CustomFieldsController.php
+++ b/app/controllers/admin/CustomFieldsController.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Controllers\Admin;
 
 class CustomFieldsController extends \BaseController {
 
diff --git a/app/routes.php b/app/routes.php
index 89382fa80c..45f60dfdca 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -140,13 +140,6 @@
         } );
     } );
 
-    
-    # Custom fieldset
-    //Route::get('/custom_fieldsets/{id}','CustomFieldsController@show');
-    //Route::get('/custom_fieldsets/create','CustomFieldsController@getCreate');
-    Route::post('/custom_fieldsets/{id}/associate','CustomFieldsController@postAssociate');
-    Route::controller('/custom_fieldsets','CustomFieldsController' );
-
     /*
     |--------------------------------------------------------------------------
     | Asset Routes
@@ -468,6 +461,12 @@
 
         } );
 
+        # Custom fieldset
+        //Route::get('/custom_fieldsets/{id}','CustomFieldsController@show');
+        //Route::get('/custom_fieldsets/create','CustomFieldsController@getCreate');
+        // Route::post(['prefix' => 'custom_fieldsets/{id}/associate','CustomFieldsController@postAssociate');
+        Route::controller('custom_fieldsets','CustomFieldsController');
+
         # User Management
         Route::group( [ 'prefix' => 'users' ], function () {