diff --git a/app/Api/V1/Controllers/todo-Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.php
similarity index 94%
rename from app/Api/V1/Controllers/todo-Search/AccountController.php
rename to app/Api/V1/Controllers/Search/AccountController.php
index d6b652b325..b1df06b854 100644
--- a/app/Api/V1/Controllers/todo-Search/AccountController.php
+++ b/app/Api/V1/Controllers/Search/AccountController.php
@@ -1,8 +1,8 @@
 <?php
 
-/**
+/*
  * AccountController.php
- * Copyright (c) 2020 james@firefly-iii.org
+ * Copyright (c) 2021 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -32,6 +32,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Pagination\LengthAwarePaginator;
+use JsonException;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use Log;
@@ -62,6 +63,7 @@ class AccountController extends Controller
      * @param Request $request
      *
      * @return JsonResponse|Response
+     * @throws JsonException
      */
     public function search(Request $request)
     {
@@ -74,7 +76,6 @@ class AccountController extends Controller
             return response(null, 422);
         }
         $types = $this->mapAccountTypes($type);
-        Log::debug(sprintf('Going to search for "%s" in types', $query), $types);
 
         /** @var AccountSearch $search */
         $search = app(AccountSearch::class);
@@ -85,7 +86,6 @@ class AccountController extends Controller
 
         $accounts = $search->search();
 
-        Log::debug(sprintf('Found %d accounts', $accounts->count()));
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
diff --git a/app/Api/V1/Controllers/todo-Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.php
similarity index 100%
rename from app/Api/V1/Controllers/todo-Search/TransactionController.php
rename to app/Api/V1/Controllers/Search/TransactionController.php
diff --git a/app/Api/V1/Controllers/todo-System/AboutController.php b/app/Api/V1/Controllers/System/AboutController.php
similarity index 100%
rename from app/Api/V1/Controllers/todo-System/AboutController.php
rename to app/Api/V1/Controllers/System/AboutController.php
diff --git a/routes/api.php b/routes/api.php
index 36bf9edcc6..7f6921ff65 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -460,6 +460,36 @@ Route::group(
     }
 );
 
+/**
+ * SEARCH ENDPOINTS
+ */
+Route::group(
+    ['namespace' => 'FireflyIII\Api\V1\Controllers\Search', 'prefix' => 'search',
+     'as'        => 'api.v1.search.',],
+    static function () {
+
+        Route::get('transactions', ['uses' => 'TransactionController@search', 'as' => 'transactions']);
+        Route::get('accounts', ['uses' => 'AccountController@search', 'as' => 'accounts']);
+    }
+);
+
+/**
+ * SYSTEM END POINTS
+ */
+// About Firefly III API routes:
+Route::group(
+    [
+        'namespace' => 'FireflyIII\Api\V1\Controllers\System', 'prefix' => 'about',
+        'as'        => 'api.v1.about.'],
+    static function () {
+
+        Route::get('', ['uses' => 'AboutController@about', 'as' => 'index']);
+        Route::get('user', ['uses' => 'AboutController@user', 'as' => 'user']);
+    }
+);
+
+
+
 
 
 
@@ -507,19 +537,6 @@ Route::group(
 
 // TODO get rid of underscores.
 
-// ABOUT FIREFLY III
-// TODO VERIFY API DOCS
-//Route::group(
-//    [
-//        'namespace' => 'FireflyIII\Api\V1\Controllers\System', 'prefix' => 'about',
-//        'as'        => 'api.v1.about.'],
-//    static function () {
-//
-//        // Accounts API routes:
-//        Route::get('', ['uses' => 'AboutController@about', 'as' => 'index']);
-//        Route::get('user', ['uses' => 'AboutController@user', 'as' => 'user']);
-//    }
-//);
 
 
 // DYNAMIC CONFIGURATION (CHANGEABLE)
@@ -598,19 +615,7 @@ Route::group(
 
 
 
-//
-//
-//// TODO VERIFY API DOCS
-//Route::group(
-//    ['namespace' => 'FireflyIII\Api\V1\Controllers\Search', 'prefix' => 'search',
-//     'as'        => 'api.v1.search.',],
-//    static function () {
-//
-//        // Attachment API routes:
-//        Route::get('transactions', ['uses' => 'TransactionController@search', 'as' => 'transactions']);
-//        Route::get('accounts', ['uses' => 'AccountController@search', 'as' => 'accounts']);
-//    }
-//);
+
 //
 //// TODO VERIFY API DOCS
 //Route::group(