diff --git a/app/Commands/AdminLogsCommand.php b/app/Commands/AdminLogsCommand.php
new file mode 100644
index 0000000..bc8af37
--- /dev/null
+++ b/app/Commands/AdminLogsCommand.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Commands;
+
+use Illuminate\Console\Scheduling\Schedule;
+use LaravelZero\Framework\Commands\Command;
+
+use PhpSchool\CliMenu\Builder\CliMenuBuilder;
+use PhpSchool\CliMenu\CliMenu;
+
+class AdminLogsCommand extends Command
+{
+    /**
+     * The signature of the command.
+     *
+     * @var string
+     */
+    protected $signature = 'admin:logs';
+
+    /**
+     * The description of the command.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     *
+     *
+     */
+    private function addInputItem()
+    {
+        $callable = function(CliMenu $menu)
+        {
+            $input = $menu->askText();
+            $result = $input->ask();
+
+            $menu->redraw();
+        };
+
+        return $callable;
+    }
+
+    /**
+     *
+     *
+     */
+    private function addCreateItem()
+    {
+        $menu = function(CliMenuBuilder $builder)
+        {
+            $data = [];
+
+            $builder
+                ->setTitle('Settings > Add')
+                ->disableDefaultItems()
+
+                // input name
+                ->addItem('name', $this->addInputItem())
+
+                // input url
+                ->addItem('url', $this->addInputItem())
+                ->addItem('handler', $this->addInputItem())
+
+                ->addLineBreak('-')
+                ->addSubMenu('actions', $this->addActions())
+
+                ->addLineBreak('-');
+        };
+
+        return $menu;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // create menu
+        $builder = $this->menu('Settings');
+
+        $builder
+            ->addSubMenu('Add', $this->addCreateItem())
+            ->addLineBreak('-');
+
+        $mainmenu = $builder->build();
+        $mainmenu->open();
+    }
+}
diff --git a/app/Commands/AdminSourcesCommand.php b/app/Commands/AdminSourcesCommand.php
new file mode 100644
index 0000000..483ccef
--- /dev/null
+++ b/app/Commands/AdminSourcesCommand.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Commands;
+
+use Illuminate\Console\Scheduling\Schedule;
+use LaravelZero\Framework\Commands\Command;
+
+use PhpSchool\CliMenu\Builder\CliMenuBuilder;
+use PhpSchool\CliMenu\CliMenu;
+
+class AdminSourcesCommand extends Command
+{
+    /**
+     * The signature of the command.
+     *
+     * @var string
+     */
+    protected $signature = 'admin:sources';
+
+    /**
+     * The description of the command.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     *
+     *
+     */
+    private function addInputItem()
+    {
+        $callable = function(CliMenu $menu)
+        {
+            $input = $menu->askText();
+            $result = $input->ask();
+
+            $menu->redraw();
+        };
+
+        return $callable;
+    }
+
+    /**
+     *
+     *
+     */
+    private function addCreateItem()
+    {
+        $menu = function(CliMenuBuilder $builder)
+        {
+            $data = [];
+
+            $builder
+                ->setTitle('Settings > Add')
+                ->disableDefaultItems()
+
+                // input name
+                ->addItem('name', $this->addInputItem())
+
+                // input url
+                ->addItem('url', $this->addInputItem())
+                ->addItem('handler', $this->addInputItem())
+
+                ->addLineBreak('-')
+                ->addSubMenu('actions', $this->addActions())
+
+                ->addLineBreak('-');
+        };
+
+        return $menu;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // create menu
+        $builder = $this->menu('Settings');
+
+        $builder
+            ->addSubMenu('Add', $this->addCreateItem())
+            ->addLineBreak('-');
+
+        $mainmenu = $builder->build();
+        $mainmenu->open();
+    }
+}
diff --git a/app/Commands/CrawlerRunCommand.php b/app/Commands/CrawlerRunCommand.php
index 6b729cc..61e8f98 100644
--- a/app/Commands/CrawlerRunCommand.php
+++ b/app/Commands/CrawlerRunCommand.php
@@ -35,12 +35,14 @@ class CrawlerRunCommand extends Command
             'https://steadyhq.com/rss/insertmoin?auth=d37bffc9-9a84-4eed-95f6-3b6cb77c2406'
         ];
 
-        $handler = new RssHandler();
-        $response = $handler->get($url);
+        $handlerClass = $source->response_handler_class;
+
+        $handler = new $handlerClass($source);
+        $response = $handler->getResponse();
 
         // if it is a 200
         if ($response->ok()) {
-            $handler->run($response, $actions);
+            $handler->run();
 
         // if there is an error on the source
         } else if ($response->serverError()) {
diff --git a/app/Commands/SettingsMenuCommand.php b/app/Commands/SettingsMenuCommand.php
deleted file mode 100644
index b36eda2..0000000
--- a/app/Commands/SettingsMenuCommand.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Commands;
-
-use Illuminate\Console\Scheduling\Schedule;
-use LaravelZero\Framework\Commands\Command;
-
-class SettingsMenuCommand extends Command
-{
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
-    protected $signature = 'settings:menu';
-
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        // create menu
-        $builder = $this->menu('Settings')
-            ->addSubMenu('Sources', [
-                'd',
-                'e'
-            ]);
-
-        $builder->addLineBreak('-');
-
-        $mainmenu = $builder->build();
-        $mainmenu->open();
-    }
-}
diff --git a/app/Handlers/Action/ActionHandler.php b/app/Handlers/Action/ActionHandler.php
new file mode 100644
index 0000000..a3a6226
--- /dev/null
+++ b/app/Handlers/Action/ActionHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\ResponseHandler;
+
+use App\Handlers\Handler;
+
+/**
+ *
+ *
+ *
+ */
+
+class ActionHandler extends Handler implements ActionHandlerInterface
+{
+    protected $data;
+
+    /**
+     *
+     *  @param mixed $data
+     *  
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+}
\ No newline at end of file
diff --git a/app/Handlers/Action/ActionInterface.php b/app/Handlers/Action/ActionInterface.php
index f2658ca..eefcc9e 100644
--- a/app/Handlers/Action/ActionInterface.php
+++ b/app/Handlers/Action/ActionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Action;
+namespace App\Handlers\Action;
 
 /**
  *
@@ -8,6 +8,5 @@ use App\Action;
  */
 interface ActionInterface
 {
-    public function config();
     public function run();
 }
diff --git a/app/Handlers/Action/MediaMove.php b/app/Handlers/Action/MediaMove.php
deleted file mode 100644
index 590b38f..0000000
--- a/app/Handlers/Action/MediaMove.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- *
- *
- *  
- */
-
-class FileMoveActionHandler extends ActionHandler {
-
-}
\ No newline at end of file
diff --git a/app/Handlers/Handler.php b/app/Handlers/Handler.php
new file mode 100644
index 0000000..14fab0a
--- /dev/null
+++ b/app/Handlers/Handler.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Handlers;
+
+/**
+ *
+ *
+ *
+ */
+
+abstract class Handler
+{
+    /**
+     *  
+     *
+     *  @param  String $className
+     *  @return Mixed
+     *
+     */
+    protected function getHandlerClass(String $className)
+    {
+        $result = NULL;
+
+        // create class
+        $class = 'App\\Handlers\\'.$className);
+
+        // if not found check for custom handlers
+        if (class_exists($class)) {
+            $result = new $class();
+        } else {
+
+            // create class
+            $class = 'CustomHandlers\\'.$className;
+
+            if (class_exists($class)) {
+                $result = new $class();
+            }
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/app/Handlers/Response/ResponseHandler.php b/app/Handlers/Response/ResponseHandler.php
index f070f71..23de907 100644
--- a/app/Handlers/Response/ResponseHandler.php
+++ b/app/Handlers/Response/ResponseHandler.php
@@ -2,20 +2,18 @@
 
 namespace App\ResponseHandler;
 
+use App\Handlers\Handler;
+
 /**
  *
  *
  *
  */
-class RssResponseHandler extends ResponseHandler implements ResponseHandlerInterface
+class ResponseHandler extends Handler implements ResponseHandlerInterface
 {
     protected $response;
     protected $source;
 
-    protected $actions;
-    protected $beforeActions;
-    protected $afterActions;
-
     /**
      *
      *  @param [type] $actions
diff --git a/app/Handlers/Response/ResponseHandlerInterface.php b/app/Handlers/Response/ResponseHandlerInterface.php
index f0c3e8c..5b8648f 100644
--- a/app/Handlers/Response/ResponseHandlerInterface.php
+++ b/app/Handlers/Response/ResponseHandlerInterface.php
@@ -7,8 +7,8 @@ namespace App\ResponseHandler;
  *
  *
  */
-interface RssResponseInterface
+interface ResponseHandlerInterface
 {
-    public function get();
-    public function handle();
+    public function getResponse();
+    public function run();
 }
\ No newline at end of file
diff --git a/app/Models/Action.php b/app/Models/Action.php
index e69de29..36bee37 100644
--- a/app/Models/Action.php
+++ b/app/Models/Action.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ *
+ *
+ *
+ */
+
+class Action extends Model
+{
+    protected $fillable = [
+        'action_handler_class',
+        'priority',
+        'source_id'
+    ];
+}
\ No newline at end of file
diff --git a/app/Models/Log.php b/app/Models/Log.php
index e69de29..18a64fe 100644
--- a/app/Models/Log.php
+++ b/app/Models/Log.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ *
+ *
+ *
+ */
+
+class Log extends Model
+{
+    protected $fillable = [
+        'message',
+        'state'
+    ];
+}
\ No newline at end of file
diff --git a/app/Models/Source.php b/app/Models/Source.php
index 7c22912..ecc11e0 100644
--- a/app/Models/Source.php
+++ b/app/Models/Source.php
@@ -1,13 +1,20 @@
 <?php
 
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
 /**
- *
  *
  *
  *
  */
 
-class Source
+class Source extends Model
 {
-    
+    protected $fillable = [
+        'name',
+        'url',
+        'response_handler_class'
+    ];
 }
\ No newline at end of file
diff --git a/database/migrations/2021_05_09_073140_create_actions_table.php b/database/migrations/2021_05_09_073140_create_actions_table.php
index 028a832..5a7c56f 100644
--- a/database/migrations/2021_05_09_073140_create_actions_table.php
+++ b/database/migrations/2021_05_09_073140_create_actions_table.php
@@ -17,9 +17,6 @@ class CreateActionsTable extends Migration
             $table->id();
 
             $table->string('action_handler_class');
-            $table->enum('type', [
-                'before', 'after'
-            ])->nullable();
             $table->integer('priority');
 
             $table->unsignedBigInteger('source_id');
diff --git a/database/migrations/2021_05_09_073140_create_logs_table.php b/database/migrations/2021_05_09_073140_create_logs_table.php
index 5e259ae..72608c6 100644
--- a/database/migrations/2021_05_09_073140_create_logs_table.php
+++ b/database/migrations/2021_05_09_073140_create_logs_table.php
@@ -21,11 +21,6 @@ class CreateLogsTable extends Migration
                 'critical', 'info', 'error'
             ]);
 
-            $table->unsignedBigInteger('source_id');
-            $table->foreign('source_id')
-                ->references('id')
-                ->on('sources');
-
             $table->timestamps();
         });
     }
diff --git a/resources/CustomHandlers/Action/FileMove.php b/resources/CustomHandlers/Action/FileMove.php
new file mode 100644
index 0000000..4394ce6
--- /dev/null
+++ b/resources/CustomHandlers/Action/FileMove.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace CustomHandlers\Actions;
+
+/**
+ *
+ *
+ *
+ */
+
+class FileMove extends ActionHandler {
+
+}
\ No newline at end of file
diff --git a/app/Handlers/Response/Rss.php b/resources/CustomHandlers/Response/Rss.php
similarity index 75%
rename from app/Handlers/Response/Rss.php
rename to resources/CustomHandlers/Response/Rss.php
index d9a5aac..6b44cad 100644
--- a/app/Handlers/Response/Rss.php
+++ b/resources/CustomHandlers/Response/Rss.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\ResponseHandler;
+namespace CustomHandlers\Response;
 
 /**
  *  Handle Response of a Rss Feed,
@@ -18,7 +18,7 @@ class Rss extends ResponseHandler
      *  @return object
      *
      */
-    public function get()
+    public function getResponse()
     {
         $this->response = Http::withHeaders([
             "Content-Type" => "text/xml;charset=utf-8"
@@ -33,13 +33,15 @@ class Rss extends ResponseHandler
      *
      *
      */
-    public function handle()
+    public function run()
     {
         $xml = new SimpleXMLElement($this->response->body());
 
         foreach($xml->channel->item as $item) {
             foreach($this->actions as $action) {
-                $action->handle($item);
+                $actionClass = $action->action_handler_class;
+                $action = new ActionClass($item);
+                $action->run();
             }
         }
     }