diff --git a/src/mangadex/downloader.cr b/src/mangadex/downloader.cr
index 33fba09..5c43437 100644
--- a/src/mangadex/downloader.cr
+++ b/src/mangadex/downloader.cr
@@ -1,268 +1,8 @@
 require "./api"
-require "sqlite3"
 require "zip"
 
 module MangaDex
-  class PageJob
-    property success = false
-    property url : String
-    property filename : String
-    property writer : Zip::Writer
-    property tries_remaning : Int32
-
-    def initialize(@url, @filename, @writer, @tries_remaning)
-    end
-  end
-
-  enum JobStatus
-    Pending      # 0
-    Downloading  # 1
-    Error        # 2
-    Completed    # 3
-    MissingPages # 4
-  end
-
-  struct Job
-    property id : String
-    property manga_id : String
-    property title : String
-    property manga_title : String
-    property status : JobStatus
-    property status_message : String = ""
-    property pages : Int32 = 0
-    property success_count : Int32 = 0
-    property fail_count : Int32 = 0
-    property time : Time
-
-    def parse_query_result(res : DB::ResultSet)
-      @id = res.read String
-      @manga_id = res.read String
-      @title = res.read String
-      @manga_title = res.read String
-      status = res.read Int32
-      @status_message = res.read String
-      @pages = res.read Int32
-      @success_count = res.read Int32
-      @fail_count = res.read Int32
-      time = res.read Int64
-      @status = JobStatus.new status
-      @time = Time.unix_ms time
-    end
-
-    # Raises if the result set does not contain the correct set of columns
-    def self.from_query_result(res : DB::ResultSet)
-      job = Job.allocate
-      job.parse_query_result res
-      job
-    end
-
-    def initialize(@id, @manga_id, @title, @manga_title, @status, @time)
-    end
-
-    def to_json(json)
-      json.object do
-        {% for name in ["id", "manga_id", "title", "manga_title",
-                        "status_message"] %}
-          json.field {{name}}, @{{name.id}}
-        {% end %}
-        {% for name in ["pages", "success_count", "fail_count"] %}
-          json.field {{name}} do
-            json.number @{{name.id}}
-          end
-        {% end %}
-        json.field "status", @status.to_s
-        json.field "time" do
-          json.number @time.to_unix_ms
-        end
-      end
-    end
-  end
-
-  class Queue
-    property downloader : Downloader?
-    @path : String
-
-    def self.default : self
-      unless @@default
-        @@default = new
-      end
-      @@default.not_nil!
-    end
-
-    def initialize(db_path : String? = nil)
-      @path = db_path || Config.current.mangadex["download_queue_db_path"].to_s
-      dir = File.dirname @path
-      unless Dir.exists? dir
-        Logger.info "The queue DB directory #{dir} does not exist. " \
-                    "Attepmting to create it"
-        Dir.mkdir_p dir
-      end
-      DB.open "sqlite3://#{@path}" do |db|
-        begin
-          db.exec "create table if not exists queue " \
-                  "(id text, manga_id text, title text, manga_title " \
-                  "text, status integer, status_message text, " \
-                  "pages integer, success_count integer, " \
-                  "fail_count integer, time integer)"
-          db.exec "create unique index if not exists id_idx " \
-                  "on queue (id)"
-          db.exec "create index if not exists manga_id_idx " \
-                  "on queue (manga_id)"
-          db.exec "create index if not exists status_idx " \
-                  "on queue (status)"
-        rescue e
-          Logger.error "Error when checking tables in DB: #{e}"
-          raise e
-        end
-      end
-    end
-
-    # Returns the earliest job in queue or nil if the job cannot be parsed.
-    #   Returns nil if queue is empty
-    def pop
-      job = nil
-      DB.open "sqlite3://#{@path}" do |db|
-        begin
-          db.query_one "select * from queue where status = 0 " \
-                       "or status = 1 order by time limit 1" do |res|
-            job = Job.from_query_result res
-          end
-        rescue
-        end
-      end
-      job
-    end
-
-    # Push an array of jobs into the queue, and return the number of jobs
-    #   inserted. Any job already exists in the queue will be ignored.
-    def push(jobs : Array(Job))
-      start_count = self.count
-      DB.open "sqlite3://#{@path}" do |db|
-        jobs.each do |job|
-          db.exec "insert or ignore into queue values " \
-                  "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-            job.id, job.manga_id, job.title, job.manga_title,
-            job.status.to_i, job.status_message, job.pages,
-            job.success_count, job.fail_count, job.time.to_unix_ms
-        end
-      end
-      self.count - start_count
-    end
-
-    def reset(id : String)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set status = 0, status_message = '', " \
-                "pages = 0, success_count = 0, fail_count = 0 " \
-                "where id = (?)", id
-      end
-    end
-
-    def reset(job : Job)
-      self.reset job.id
-    end
-
-    # Reset all failed tasks (missing pages and error)
-    def reset
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set status = 0, status_message = '', " \
-                "pages = 0, success_count = 0, fail_count = 0 " \
-                "where status = 2 or status = 4"
-      end
-    end
-
-    def delete(id : String)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "delete from queue where id = (?)", id
-      end
-    end
-
-    def delete(job : Job)
-      self.delete job.id
-    end
-
-    def delete_status(status : JobStatus)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "delete from queue where status = (?)", status.to_i
-      end
-    end
-
-    def count_status(status : JobStatus)
-      num = 0
-      DB.open "sqlite3://#{@path}" do |db|
-        num = db.query_one "select count(*) from queue where " \
-                           "status = (?)", status.to_i, as: Int32
-      end
-      num
-    end
-
-    def count
-      num = 0
-      DB.open "sqlite3://#{@path}" do |db|
-        num = db.query_one "select count(*) from queue", as: Int32
-      end
-      num
-    end
-
-    def set_status(status : JobStatus, job : Job)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set status = (?) where id = (?)",
-          status.to_i, job.id
-      end
-    end
-
-    def get_all
-      jobs = [] of Job
-      DB.open "sqlite3://#{@path}" do |db|
-        jobs = db.query_all "select * from queue order by time" do |rs|
-          Job.from_query_result rs
-        end
-      end
-      jobs
-    end
-
-    def add_success(job : Job)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set success_count = success_count + 1 " \
-                "where id = (?)", job.id
-      end
-    end
-
-    def add_fail(job : Job)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set fail_count = fail_count + 1 " \
-                "where id = (?)", job.id
-      end
-    end
-
-    def set_pages(pages : Int32, job : Job)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set pages = (?), success_count = 0, " \
-                "fail_count = 0 where id = (?)", pages, job.id
-      end
-    end
-
-    def add_message(msg : String, job : Job)
-      DB.open "sqlite3://#{@path}" do |db|
-        db.exec "update queue set status_message = " \
-                "status_message || (?) || (?) where id = (?)",
-          "\n", msg, job.id
-      end
-    end
-
-    def pause
-      @downloader.not_nil!.stopped = true
-    end
-
-    def resume
-      @downloader.not_nil!.stopped = false
-    end
-
-    def paused?
-      @downloader.not_nil!.stopped
-    end
-  end
-
-  class Downloader
+  class Downloader < Queue::Downloader
     property stopped = false
     @wait_seconds : Int32 = Config.current.mangadex["download_wait_seconds"]
       .to_i32
@@ -280,7 +20,7 @@ module MangaDex
     def initialize
       @queue = Queue.default
       @api = API.default
-      @queue.downloader = self
+      @queue << self
 
       spawn do
         loop do
@@ -297,14 +37,14 @@ module MangaDex
       end
     end
 
-    private def download(job : Job)
+    private def download(job : Queue::Job)
       @downloading = true
-      @queue.set_status JobStatus::Downloading, job
+      @queue.set_status Queue::JobStatus::Downloading, job
       begin
         chapter = @api.get_chapter(job.id)
       rescue e
         Logger.error e
-        @queue.set_status JobStatus::Error, job
+        @queue.set_status Queue::JobStatus::Error, job
         unless e.message.nil?
           @queue.add_message e.message.not_nil!, job
         end
@@ -326,13 +66,13 @@ module MangaDex
 
       writer = Zip::Writer.new zip_path
       # Create a buffered channel. It works as an FIFO queue
-      channel = Channel(PageJob).new chapter.pages.size
+      channel = Channel(Queue::PageJob).new chapter.pages.size
       spawn do
         chapter.pages.each_with_index do |tuple, i|
           fn, url = tuple
           ext = File.extname fn
           fn = "#{i.to_s.rjust len, '0'}#{ext}"
-          page_job = PageJob.new url, fn, writer, @retries
+          page_job = Queue::PageJob.new url, fn, writer, @retries
           Logger.debug "Downloading #{url}"
           loop do
             sleep @wait_seconds.seconds
@@ -350,7 +90,7 @@ module MangaDex
       end
 
       spawn do
-        page_jobs = [] of PageJob
+        page_jobs = [] of Queue::PageJob
         chapter.pages.size.times do
           page_job = channel.receive
           Logger.debug "[#{page_job.success ? "success" : "failed"}] " \
@@ -378,17 +118,17 @@ module MangaDex
         if !zip_exception.nil?
           @queue.add_message "The downloaded archive is corrupted. " \
                              "Error: #{zip_exception}", job
-          @queue.set_status JobStatus::Error, job
+          @queue.set_status Queue::JobStatus::Error, job
         elsif fail_count > 0
-          @queue.set_status JobStatus::MissingPages, job
+          @queue.set_status Queue::JobStatus::MissingPages, job
         else
-          @queue.set_status JobStatus::Completed, job
+          @queue.set_status Queue::JobStatus::Completed, job
         end
         @downloading = false
       end
     end
 
-    private def download_page(job : PageJob)
+    private def download_page(job : Queue::PageJob)
       Logger.debug "downloading #{job.url}"
       headers = HTTP::Headers{
         "User-agent" => "Mangadex.cr",
diff --git a/src/mango.cr b/src/mango.cr
index fb7efbc..e9a6a40 100644
--- a/src/mango.cr
+++ b/src/mango.cr
@@ -1,8 +1,10 @@
 require "./config"
+require "./queue"
 require "./server"
 require "./mangadex/*"
 require "option_parser"
 require "clim"
+require "./plugin/*"
 
 MANGO_VERSION = "0.8.0"
 
diff --git a/src/plugin/downloader.cr b/src/plugin/downloader.cr
new file mode 100644
index 0000000..8726f7d
--- /dev/null
+++ b/src/plugin/downloader.cr
@@ -0,0 +1,18 @@
+class Plugin
+  class Downloader < Queue::Downloader
+    @library_path : String = Config.current.library_path
+    @downloading = false
+
+    def self.default : self
+      unless @@default
+        @@default = new
+      end
+      @@default.not_nil!
+    end
+
+    def initialize
+      @queue = Queue.default
+      @queue << self
+    end
+  end
+end
diff --git a/src/queue.cr b/src/queue.cr
new file mode 100644
index 0000000..b1e1613
--- /dev/null
+++ b/src/queue.cr
@@ -0,0 +1,271 @@
+require "sqlite3"
+
+class Queue
+  class Downloader
+    property stopped = false
+  end
+
+  class PageJob
+    property success = false
+    property url : String
+    property filename : String
+    property writer : Zip::Writer
+    property tries_remaning : Int32
+
+    def initialize(@url, @filename, @writer, @tries_remaning)
+    end
+  end
+
+  enum JobStatus
+    Pending      # 0
+    Downloading  # 1
+    Error        # 2
+    Completed    # 3
+    MissingPages # 4
+  end
+
+  struct Job
+    property id : String
+    property manga_id : String
+    property title : String
+    property manga_title : String
+    property status : JobStatus
+    property status_message : String = ""
+    property pages : Int32 = 0
+    property success_count : Int32 = 0
+    property fail_count : Int32 = 0
+    property time : Time
+
+    def parse_query_result(res : DB::ResultSet)
+      @id = res.read String
+      @manga_id = res.read String
+      @title = res.read String
+      @manga_title = res.read String
+      status = res.read Int32
+      @status_message = res.read String
+      @pages = res.read Int32
+      @success_count = res.read Int32
+      @fail_count = res.read Int32
+      time = res.read Int64
+      @status = JobStatus.new status
+      @time = Time.unix_ms time
+    end
+
+    # Raises if the result set does not contain the correct set of columns
+    def self.from_query_result(res : DB::ResultSet)
+      job = Job.allocate
+      job.parse_query_result res
+      job
+    end
+
+    def initialize(@id, @manga_id, @title, @manga_title, @status, @time)
+    end
+
+    def to_json(json)
+      json.object do
+        {% for name in ["id", "manga_id", "title", "manga_title",
+                        "status_message"] %}
+          json.field {{name}}, @{{name.id}}
+        {% end %}
+        {% for name in ["pages", "success_count", "fail_count"] %}
+          json.field {{name}} do
+            json.number @{{name.id}}
+          end
+        {% end %}
+        json.field "status", @status.to_s
+        json.field "time" do
+          json.number @time.to_unix_ms
+        end
+      end
+    end
+  end
+
+  @path : String
+  @downloaders = [] of Downloader
+  @paused = false
+
+  def self.default : self
+    unless @@default
+      @@default = new
+    end
+    @@default.not_nil!
+  end
+
+  def initialize(db_path : String? = nil)
+    @path = db_path || Config.current.mangadex["download_queue_db_path"].to_s
+    dir = File.dirname @path
+    unless Dir.exists? dir
+      Logger.info "The queue DB directory #{dir} does not exist. " \
+                  "Attepmting to create it"
+      Dir.mkdir_p dir
+    end
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        db.exec "create table if not exists queue " \
+                "(id text, manga_id text, title text, manga_title " \
+                "text, status integer, status_message text, " \
+                "pages integer, success_count integer, " \
+                "fail_count integer, time integer)"
+        db.exec "create unique index if not exists id_idx " \
+                "on queue (id)"
+        db.exec "create index if not exists manga_id_idx " \
+                "on queue (manga_id)"
+        db.exec "create index if not exists status_idx " \
+                "on queue (status)"
+      rescue e
+        Logger.error "Error when checking tables in DB: #{e}"
+        raise e
+      end
+    end
+  end
+
+  # Returns the earliest job in queue or nil if the job cannot be parsed.
+  #   Returns nil if queue is empty
+  def pop
+    job = nil
+    DB.open "sqlite3://#{@path}" do |db|
+      begin
+        db.query_one "select * from queue where status = 0 " \
+                     "or status = 1 order by time limit 1" do |res|
+          job = Job.from_query_result res
+        end
+      rescue
+      end
+    end
+    job
+  end
+
+  # Push an array of jobs into the queue, and return the number of jobs
+  #   inserted. Any job already exists in the queue will be ignored.
+  def push(jobs : Array(Job))
+    start_count = self.count
+    DB.open "sqlite3://#{@path}" do |db|
+      jobs.each do |job|
+        db.exec "insert or ignore into queue values " \
+                "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+          job.id, job.manga_id, job.title, job.manga_title,
+          job.status.to_i, job.status_message, job.pages,
+          job.success_count, job.fail_count, job.time.to_unix_ms
+      end
+    end
+    self.count - start_count
+  end
+
+  def reset(id : String)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set status = 0, status_message = '', " \
+              "pages = 0, success_count = 0, fail_count = 0 " \
+              "where id = (?)", id
+    end
+  end
+
+  def reset(job : Job)
+    self.reset job.id
+  end
+
+  # Reset all failed tasks (missing pages and error)
+  def reset
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set status = 0, status_message = '', " \
+              "pages = 0, success_count = 0, fail_count = 0 " \
+              "where status = 2 or status = 4"
+    end
+  end
+
+  def delete(id : String)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "delete from queue where id = (?)", id
+    end
+  end
+
+  def delete(job : Job)
+    self.delete job.id
+  end
+
+  def delete_status(status : JobStatus)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "delete from queue where status = (?)", status.to_i
+    end
+  end
+
+  def count_status(status : JobStatus)
+    num = 0
+    DB.open "sqlite3://#{@path}" do |db|
+      num = db.query_one "select count(*) from queue where " \
+                         "status = (?)", status.to_i, as: Int32
+    end
+    num
+  end
+
+  def count
+    num = 0
+    DB.open "sqlite3://#{@path}" do |db|
+      num = db.query_one "select count(*) from queue", as: Int32
+    end
+    num
+  end
+
+  def set_status(status : JobStatus, job : Job)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set status = (?) where id = (?)",
+        status.to_i, job.id
+    end
+  end
+
+  def get_all
+    jobs = [] of Job
+    DB.open "sqlite3://#{@path}" do |db|
+      jobs = db.query_all "select * from queue order by time" do |rs|
+        Job.from_query_result rs
+      end
+    end
+    jobs
+  end
+
+  def add_success(job : Job)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set success_count = success_count + 1 " \
+              "where id = (?)", job.id
+    end
+  end
+
+  def add_fail(job : Job)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set fail_count = fail_count + 1 " \
+              "where id = (?)", job.id
+    end
+  end
+
+  def set_pages(pages : Int32, job : Job)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set pages = (?), success_count = 0, " \
+              "fail_count = 0 where id = (?)", pages, job.id
+    end
+  end
+
+  def add_message(msg : String, job : Job)
+    DB.open "sqlite3://#{@path}" do |db|
+      db.exec "update queue set status_message = " \
+              "status_message || (?) || (?) where id = (?)",
+        "\n", msg, job.id
+    end
+  end
+
+  def <<(downloader : Downloader)
+    @downloaders << downloader
+  end
+
+  def pause
+    @downloaders.each { |d| d.stopped = true }
+    @paused = true
+  end
+
+  def resume
+    @downloaders.each { |d| d.stopped = false }
+    @paused = false
+  end
+
+  def paused?
+    @paused
+  end
+end
diff --git a/src/routes/api.cr b/src/routes/api.cr
index 4911c1b..6ef86c8 100644
--- a/src/routes/api.cr
+++ b/src/routes/api.cr
@@ -136,12 +136,12 @@ class APIRouter < Router
       begin
         chapters = env.params.json["chapters"].as(Array).map { |c| c.as_h }
         jobs = chapters.map { |chapter|
-          MangaDex::Job.new(
+          Queue::Job.new(
             chapter["id"].as_s,
             chapter["manga_id"].as_s,
             chapter["full_title"].as_s,
             chapter["manga_title"].as_s,
-            MangaDex::JobStatus::Pending,
+            Queue::JobStatus::Pending,
             Time.unix chapter["time"].as_s.to_i
           )
         }
@@ -179,7 +179,7 @@ class APIRouter < Router
         case action
         when "delete"
           if id.nil?
-            @context.queue.delete_status MangaDex::JobStatus::Completed
+            @context.queue.delete_status Queue::JobStatus::Completed
           else
             @context.queue.delete id
           end
diff --git a/src/server.cr b/src/server.cr
index 7a36bb9..fc4f7ae 100644
--- a/src/server.cr
+++ b/src/server.cr
@@ -8,7 +8,7 @@ require "./routes/*"
 class Context
   property library : Library
   property storage : Storage
-  property queue : MangaDex::Queue
+  property queue : Queue
 
   def self.default : self
     unless @@default
@@ -20,7 +20,7 @@ class Context
   def initialize
     @storage = Storage.default
     @library = Library.default
-    @queue = MangaDex::Queue.default
+    @queue = Queue.default
   end
 
   {% for lvl in Logger::LEVELS %}