diff --git a/cps.py b/cps.py
index 055c0ffe..d38a9f33 100755
--- a/cps.py
+++ b/cps.py
@@ -1,21 +1,16 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import os
 import sys
-
-base_path = os.path.dirname(os.path.abspath(__file__))
-# Insert local directories into path
-sys.path.append(base_path)
-sys.path.append(os.path.join(base_path, 'cps'))
-sys.path.append(os.path.join(base_path, 'vendor'))
-
-from cps.server import Server
+from cps import create_app
+from cps.web import web
+from cps import Server
 
 if __name__ == '__main__':
+    app = create_app()
+    app.register_blueprint(web)
     Server.startServer()
 
 
 
 
-
diff --git a/cps/__init__.py b/cps/__init__.py
index faa18be5..1170a85a 100755
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -1,2 +1,85 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
+# import logging
+# from logging.handlers import SMTPHandler, RotatingFileHandler
+# import os
+
+from flask import Flask# , request, current_app
+from flask_login import LoginManager
+from flask_babel import Babel # , lazy_gettext as _l
+import cache_buster
+from reverseproxy import ReverseProxied
+import logging
+from logging.handlers import RotatingFileHandler
+from flask_principal import Principal
+# from flask_sqlalchemy import SQLAlchemy
+import os
+import ub
+from ub import Config, Settings
+import cPickle
+
+
+# Normal
+babel = Babel()
+lm = LoginManager()
+lm.login_view = 'web.login'
+lm.anonymous_user = ub.Anonymous
+
+
+
+ub_session = ub.session
+# ub_session.start()
+config = Config()
+
+
+import db
+
+with open(os.path.join(config.get_main_dir, 'cps/translations/iso639.pickle'), 'rb') as f:
+   language_table = cPickle.load(f)
+
+searched_ids = {}
+
+
+from worker import WorkerThread
+
+global_WorkerThread = WorkerThread()
+
+from server import server
+Server = server()
+
+
+def create_app():
+    app = Flask(__name__)
+    app.wsgi_app = ReverseProxied(app.wsgi_app)
+    cache_buster.init_cache_busting(app)
+
+    formatter = logging.Formatter(
+        "[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s")
+    try:
+        file_handler = RotatingFileHandler(config.get_config_logfile(), maxBytes=50000, backupCount=2)
+    except IOError:
+        file_handler = RotatingFileHandler(os.path.join(config.get_main_dir, "calibre-web.log"),
+                                           maxBytes=50000, backupCount=2)
+        # ToDo: reset logfile value in config class
+    file_handler.setFormatter(formatter)
+    app.logger.addHandler(file_handler)
+    app.logger.setLevel(config.config_log_level)
+
+    app.logger.info('Starting Calibre Web...')
+    logging.getLogger("book_formats").addHandler(file_handler)
+    logging.getLogger("book_formats").setLevel(config.config_log_level)
+    Principal(app)
+    lm.init_app(app)
+    babel.init_app(app)
+    app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
+    Server.init_app(app)
+    db.setup_db()
+    global_WorkerThread.start()
+
+    # app.config.from_object(config_class)
+    # db.init_app(app)
+    # login.init_app(app)
+
+
+    return app
diff --git a/cps/db.py b/cps/db.py
index 225bcf4e..c9fecd37 100755
--- a/cps/db.py
+++ b/cps/db.py
@@ -24,7 +24,7 @@ from sqlalchemy.orm import *
 import os
 import re
 import ast
-from ub import config
+from cps import config
 import ub
 import sys
 
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index cb36a413..1f0b8b83 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -27,7 +27,7 @@ except ImportError:
     gdrive_support = False
 
 import os
-from ub import config
+from cps import config
 import cli
 import shutil
 from flask import Response, stream_with_context
diff --git a/cps/helper.py b/cps/helper.py
index 0f489942..ba323449 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -20,14 +20,13 @@
 
 
 import db
-import ub
+from cps import config
 from flask import current_app as app
 from tempfile import gettempdir
 import sys
 import os
 import re
 import unicodedata
-# from io import BytesIO
 import worker
 import time
 from flask import send_from_directory, make_response, redirect, abort
@@ -41,9 +40,10 @@ try:
     import gdriveutils as gd
 except ImportError:
     pass
-import web
+# import web
 import random
 from subproc_wrapper import process_open
+import ub
 
 try:
     import unidecode
@@ -51,11 +51,6 @@ try:
 except ImportError:
     use_unidecode = False
 
-# Global variables
-# updater_thread = None
-global_WorkerThread = worker.WorkerThread()
-global_WorkerThread.start()
-
 
 def update_download(book_id, user_id):
     check = ub.session.query(ub.Downloads).filter(ub.Downloads.user_id == user_id).filter(ub.Downloads.book_id ==
@@ -73,7 +68,7 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
         error_message = _(u"%(format)s format not found for book id: %(book)d", format=old_book_format, book=book_id)
         app.logger.error("convert_book_format: " + error_message)
         return error_message
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         df = gd.getFileFromEbooksFolder(book.path, data.name + "." + old_book_format.lower())
         if df:
             datafile = os.path.join(calibrepath, book.path, data.name + u"." + old_book_format.lower())
@@ -133,7 +128,7 @@ def check_send_to_kindle(entry):
     """
     if len(entry.data):
         bookformats=list()
-        if ub.config.config_ebookconverter == 0:
+        if config.config_ebookconverter == 0:
             # no converter - only for mobi and pdf formats
             for ele in iter(entry.data):
                 if 'MOBI' in ele.format:
@@ -156,11 +151,11 @@ def check_send_to_kindle(entry):
                 bookformats.append({'format': 'Azw3','convert':0,'text':_('Send %(format)s to Kindle',format='Azw3')})
             if 'PDF' in formats:
                 bookformats.append({'format': 'Pdf','convert':0,'text':_('Send %(format)s to Kindle',format='Pdf')})
-            if ub.config.config_ebookconverter >= 1:
+            if config.config_ebookconverter >= 1:
                 if 'EPUB' in formats and not 'MOBI' in formats:
                     bookformats.append({'format': 'Mobi','convert':1,
                             'text':_('Convert %(orig)s to %(format)s and send to Kindle',orig='Epub',format='Mobi')})
-            if ub.config.config_ebookconverter == 2:
+            if config.config_ebookconverter == 2:
                 if 'EPUB' in formats and not 'AZW3' in formats:
                     bookformats.append({'format': 'Azw3','convert':1,
                             'text':_('Convert %(orig)s to %(format)s and send to Kindle',orig='Epub',format='Azw3')})
@@ -407,21 +402,21 @@ def generate_random_password():
 ################################## External interface
 
 def update_dir_stucture(book_id, calibrepath, first_author = None):
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author)
     else:
         return update_dir_structure_file(book_id, calibrepath, first_author)
 
 
 def delete_book(book, calibrepath, book_format):
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
         return delete_book_file(book, calibrepath, book_format)
 
 
 def get_book_cover(cover_path):
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         try:
             if not web.is_gdrive_ready():
                 return send_from_directory(os.path.join(os.path.dirname(__file__), "static"), "generic_cover.jpg")
@@ -437,7 +432,7 @@ def get_book_cover(cover_path):
             # traceback.print_exc()
             return send_from_directory(os.path.join(os.path.dirname(__file__), "static"),"generic_cover.jpg")
     else:
-        return send_from_directory(os.path.join(ub.config.config_calibre_dir, cover_path), "cover.jpg")
+        return send_from_directory(os.path.join(config.config_calibre_dir, cover_path), "cover.jpg")
 
 
 # saves book cover to gdrive or locally
@@ -447,7 +442,7 @@ def save_cover(url, book_path):
         web.app.logger.error("Cover is no jpg file, can't save")
         return False
 
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         tmpDir = gettempdir()
         f = open(os.path.join(tmpDir, "uploaded_cover.jpg"), "wb")
         f.write(img.content)
@@ -456,7 +451,7 @@ def save_cover(url, book_path):
         web.app.logger.info("Cover is saved on Google Drive")
         return True
 
-    f = open(os.path.join(ub.config.config_calibre_dir, book_path, "cover.jpg"), "wb")
+    f = open(os.path.join(config.config_calibre_dir, book_path, "cover.jpg"), "wb")
     f.write(img.content)
     f.close()
     web.app.logger.info("Cover is saved")
@@ -464,7 +459,7 @@ def save_cover(url, book_path):
 
 
 def do_download_file(book, book_format, data, headers):
-    if ub.config.config_use_google_drive:
+    if config.config_use_google_drive:
         startTime = time.time()
         df = gd.getFileFromEbooksFolder(book.path, data.name + "." + book_format)
         web.app.logger.debug(time.time() - startTime)
@@ -473,7 +468,7 @@ def do_download_file(book, book_format, data, headers):
         else:
             abort(404)
     else:
-        filename = os.path.join(ub.config.config_calibre_dir, book.path)
+        filename = os.path.join(config.config_calibre_dir, book.path)
         if not os.path.isfile(os.path.join(filename, data.name + "." + book_format)):
             # ToDo: improve error handling
             web.app.logger.error('File not found: %s' % os.path.join(filename, data.name + "." + book_format))
diff --git a/cps/pagination.py b/cps/pagination.py
new file mode 100644
index 00000000..891d616d
--- /dev/null
+++ b/cps/pagination.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2018-2019 OzzieIsaacs, cervinko, jkrehm, bodybybuddha, ok11,
+#                            andy29485, idalin, Kyosfonica, wuqi, Kennyl, lemmsh,
+#                            falgh1, grunjol, csitko, ytils, xybydy, trasba, vrabe,
+#                            ruben-herold, marblepebble, JackED42, SiphonSquirrel,
+#                            apetresc, nanu-c, mutschler
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from math import ceil
+
+# simple pagination for the feed
+class Pagination(object):
+    def __init__(self, page, per_page, total_count):
+        self.page = int(page)
+        self.per_page = int(per_page)
+        self.total_count = int(total_count)
+
+    @property
+    def next_offset(self):
+        return int(self.page * self.per_page)
+
+    @property
+    def previous_offset(self):
+        return int((self.page - 2) * self.per_page)
+
+    @property
+    def last_offset(self):
+        last = int(self.total_count) - int(self.per_page)
+        if last < 0:
+            last = 0
+        return int(last)
+
+    @property
+    def pages(self):
+        return int(ceil(self.total_count / float(self.per_page)))
+
+    @property
+    def has_prev(self):
+        return self.page > 1
+
+    @property
+    def has_next(self):
+        return self.page < self.pages
+
+    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shwn
+    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shwn
+    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shwn
+    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shwn
+    def iter_pages(self, left_edge=2, left_current=2,
+                   right_current=4, right_edge=2):
+        last = 0
+        left_current = self.page - left_current - 1
+        right_current = self.page + right_current + 1
+        right_edge = self.pages - right_edge
+        for num in range(1, (self.pages + 1)):
+            if num <= left_edge or (left_current < num < right_current) or num > right_edge:
+                if last + 1 != num:
+                    yield None
+                yield num
+                last = num
diff --git a/cps/server.py b/cps/server.py
index 0531a729..a2c122dc 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -22,7 +22,7 @@ from socket import error as SocketError
 import sys
 import os
 import signal
-import web
+from cps import config, global_WorkerThread
 
 try:
     from gevent.pywsgi import WSGIServer
@@ -42,82 +42,81 @@ class server:
 
     wsgiserver = None
     restart= False
+    app = None
 
     def __init__(self):
         signal.signal(signal.SIGINT, self.killServer)
         signal.signal(signal.SIGTERM, self.killServer)
 
+    def init_app(self,application):
+        self.app = application
+
     def start_gevent(self):
         try:
             ssl_args = dict()
-            certfile_path   = web.ub.config.get_config_certfile()
-            keyfile_path    = web.ub.config.get_config_keyfile()
+            certfile_path   = config.get_config_certfile()
+            keyfile_path    = config.get_config_keyfile()
             if certfile_path and keyfile_path:
                 if os.path.isfile(certfile_path) and os.path.isfile(keyfile_path):
                     ssl_args = {"certfile": certfile_path,
                                 "keyfile": keyfile_path}
                 else:
-                    web.app.logger.info('The specified paths for the ssl certificate file and/or key file seem to be broken. Ignoring ssl. Cert path: %s | Key path: %s' % (certfile_path, keyfile_path))
+                    self.app.logger.info('The specified paths for the ssl certificate file and/or key file seem to be broken. Ignoring ssl. Cert path: %s | Key path: %s' % (certfile_path, keyfile_path))
             if os.name == 'nt':
-                self.wsgiserver= WSGIServer(('0.0.0.0', web.ub.config.config_port), web.app, spawn=Pool(), **ssl_args)
+                self.wsgiserver= WSGIServer(('0.0.0.0', config.config_port), self.app, spawn=Pool(), **ssl_args)
             else:
-                self.wsgiserver = WSGIServer(('', web.ub.config.config_port), web.app, spawn=Pool(), **ssl_args)
-            web.py3_gevent_link = self.wsgiserver
+                self.wsgiserver = WSGIServer(('', config.config_port), self.app, spawn=Pool(), **ssl_args)
             self.wsgiserver.serve_forever()
 
         except SocketError:
             try:
-                web.app.logger.info('Unable to listen on \'\', trying on IPv4 only...')
-                self.wsgiserver = WSGIServer(('0.0.0.0', web.ub.config.config_port), web.app, spawn=Pool(), **ssl_args)
-                web.py3_gevent_link = self.wsgiserver
+                self.app.logger.info('Unable to listen on \'\', trying on IPv4 only...')
+                self.wsgiserver = WSGIServer(('0.0.0.0', config.config_port), self.app, spawn=Pool(), **ssl_args)
                 self.wsgiserver.serve_forever()
             except (OSError, SocketError) as e:
-                web.app.logger.info("Error starting server: %s" % e.strerror)
+                self.app.logger.info("Error starting server: %s" % e.strerror)
                 print("Error starting server: %s" % e.strerror)
-                web.helper.global_WorkerThread.stop()
+                global_WorkerThread.stop()
                 sys.exit(1)
         except Exception:
-            web.app.logger.info("Unknown error while starting gevent")
+            self.app.logger.info("Unknown error while starting gevent")
 
     def startServer(self):
         if gevent_present:
-            web.app.logger.info('Starting Gevent server')
+            self.app.logger.info('Starting Gevent server')
             # leave subprocess out to allow forking for fetchers and processors
             self.start_gevent()
         else:
             try:
                 ssl = None
-                web.app.logger.info('Starting Tornado server')
-                certfile_path   = web.ub.config.get_config_certfile()
-                keyfile_path    = web.ub.config.get_config_keyfile()
+                self.app.logger.info('Starting Tornado server')
+                certfile_path   = config.get_config_certfile()
+                keyfile_path    = config.get_config_keyfile()
                 if certfile_path and keyfile_path:
                     if os.path.isfile(certfile_path) and os.path.isfile(keyfile_path):
                         ssl = {"certfile": certfile_path,
                                "keyfile": keyfile_path}
                     else:
-                        web.app.logger.info('The specified paths for the ssl certificate file and/or key file seem to be broken. Ignoring ssl. Cert path: %s | Key path: %s' % (certfile_path, keyfile_path))
+                        self.app.logger.info('The specified paths for the ssl certificate file and/or key file seem to be broken. Ignoring ssl. Cert path: %s | Key path: %s' % (certfile_path, keyfile_path))
 
                 # Max Buffersize set to 200MB
-                http_server = HTTPServer(WSGIContainer(web.app),
+                http_server = HTTPServer(WSGIContainer(self.app),
                             max_buffer_size = 209700000,
                             ssl_options=ssl)
-                http_server.listen(web.ub.config.config_port)
+                http_server.listen(config.config_port)
                 self.wsgiserver=IOLoop.instance()
                 self.wsgiserver.start()
                 # wait for stop signal
                 self.wsgiserver.close(True)
             except SocketError as e:
-                web.app.logger.info("Error starting server: %s" % e.strerror)
+                self.app.logger.info("Error starting server: %s" % e.strerror)
                 print("Error starting server: %s" % e.strerror)
-                web.helper.global_WorkerThread.stop()
+                global_WorkerThread.stop()
                 sys.exit(1)
 
-        # ToDo: Somehow caused by circular import under python3 refactor
-        if sys.version_info > (3, 0):
-            self.restart = web.py3_restart_Typ
         if self.restart == True:
-            web.app.logger.info("Performing restart of Calibre-Web")
-            web.helper.global_WorkerThread.stop()
+            self.app.logger.info("Performing restart of Calibre-Web")
+            global_WorkerThread.stop()
             if os.name == 'nt':
                 arguments = ["\"" + sys.executable + "\""]
                 for e in sys.argv:
@@ -126,26 +125,17 @@ class server:
             else:
                 os.execl(sys.executable, sys.executable, *sys.argv)
         else:
-            web.app.logger.info("Performing shutdown of Calibre-Web")
-            web.helper.global_WorkerThread.stop()
+            self.app.logger.info("Performing shutdown of Calibre-Web")
+            global_WorkerThread.stop()
         sys.exit(0)
 
     def setRestartTyp(self,starttyp):
         self.restart = starttyp
-        # ToDo: Somehow caused by circular import under python3 refactor
-        web.py3_restart_Typ = starttyp
 
     def killServer(self, signum, frame):
         self.stopServer()
 
     def stopServer(self):
-        # ToDo: Somehow caused by circular import under python3 refactor
-        if sys.version_info > (3, 0):
-            if not self.wsgiserver:
-                if gevent_present:
-                    self.wsgiserver = web.py3_gevent_link
-                else:
-                    self.wsgiserver = IOLoop.instance()
         if self.wsgiserver:
             if gevent_present:
                 self.wsgiserver.close()
@@ -155,10 +145,6 @@ class server:
     @staticmethod
     def getNameVersion():
         if gevent_present:
-            return {'Gevent':'v'+geventVersion}
+            return {'Gevent':'v' + geventVersion}
         else:
             return {'Tornado':'v'+tornadoVersion}
-
-
-# Start Instance of Server
-Server=server()
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index e43e3f6b..4063f23b 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -18,7 +18,7 @@
         {% for user in content %}
           {% if not user.role_anonymous() or config.config_anonbrowse %}
           <tr>
-            <td><a href="{{url_for('edit_user', user_id=user.id)}}">{{user.nickname}}</a></td>
+            <td><a href="{{url_for('web.edit_user', user_id=user.id)}}">{{user.nickname}}</a></td>
             <td>{{user.email}}</td>
             <td>{{user.kindle_mail}}</td>
             <td>{{user.downloads.count()}}</td>
@@ -30,7 +30,7 @@
           {% endif %}
         {% endfor %}
       </table>
-      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('new_user')}}">{{_('Add new user')}}</a></div>
+      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('web.new_user')}}">{{_('Add new user')}}</a></div>
     </div>
   </div>
 
@@ -53,7 +53,7 @@
           <td class="hidden-xs">{{email.mail_from}}</td>
         </tr>
       </table>
-      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
+      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('web.edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
     </div>
   </div>
 
@@ -96,8 +96,8 @@
             <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
         </div>
       </div>
-      <div class="btn btn-default"><a id="basic_config" href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
-      <div class="btn btn-default"><a id="view_config" href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="basic_config" href="{{url_for('web.configuration')}}">{{_('Basic Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="view_config" href="{{url_for('web.view_configuration')}}">{{_('UI Configuration')}}</a></div>
     </div>
   </div>
 
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index c9871f1a..449a2d57 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -6,7 +6,7 @@
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
       {% if book.has_cover %}
-        <img src="{{ url_for('get_cover', book_id=book.id) }}" alt="{{ book.title }}"/>
+        <img src="{{ url_for('web.get_cover', book_id=book.id) }}" alt="{{ book.title }}"/>
       {% else %}
         <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ book.title }}"/>
       {% endif %}
@@ -19,7 +19,7 @@
       <div class="text-center more-stuff"><h4>{{_('Delete formats:')}}</h4>
       {% for file in book.data %}
         <div class="form-group">
-          <a href="{{ url_for('delete_book', book_id=book.id, book_format=file.format) }}" class="btn btn-danger" type="button">{{_('Delete')}} - {{file.format}}</a>
+          <a href="{{ url_for('web.delete_book', book_id=book.id, book_format=file.format) }}" class="btn btn-danger" type="button">{{_('Delete')}} - {{file.format}}</a>
         </div>
       {% endfor %}
       </div>
@@ -28,7 +28,7 @@
 
 {%  if source_formats|length > 0 and conversion_formats|length > 0 %}
   <div class="text-center more-stuff"><h4>{{_('Convert book format:')}}</h4>
-      <form class="padded-bottom" action="{{ url_for('convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
+      <form class="padded-bottom" action="{{ url_for('web.convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
           <div class="form-group">
               <div class="text-left">
                   <label class="control-label" for="book_format_from">{{_('Convert from:')}}</label>
@@ -53,7 +53,7 @@
 {% endif %}
 
   </div>
-<form role="form" action="{{ url_for('edit_book', book_id=book.id) }}" method="post" enctype="multipart/form-data" id="book_edit_frm">
+<form role="form" action="{{ url_for('web.edit_book', book_id=book.id) }}" method="post" enctype="multipart/form-data" id="book_edit_frm">
   <div class="col-sm-9 col-xs-12">
     <div class="form-group">
       <label for="book_title">{{_('Book Title')}}</label>
@@ -175,7 +175,7 @@
     </div>
     <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Get metadata')}}</a>
     <button type="submit" id="submit" class="btn btn-default">{{_('Submit')}}</button>
-    <a href="{{ url_for('show_book', book_id=book.id) }}" class="btn btn-default">{{_('Back')}}</a>
+    <a href="{{ url_for('web.show_book', book_id=book.id) }}" class="btn btn-default">{{_('Back')}}</a>
   </div>
 </form>
 
@@ -196,7 +196,7 @@
         </div>
 
       <div class="modal-footer">
-        <a href="{{ url_for('delete_book', book_id=book.id) }}" class="btn btn-danger">{{_('Delete')}}</a>
+        <a href="{{ url_for('web.delete_book', book_id=book.id) }}" class="btn btn-danger">{{_('Delete')}}</a>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
       </div>
     </div>
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 4bb96eb6..e68bcf47 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -5,7 +5,7 @@
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
         {% if entry.has_cover %}
-          <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+          <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
         {% else %}
           <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
         {% endif %}
@@ -22,7 +22,7 @@
                     {{_('Download')}} :
                   </button>
                   {% for format in entry.data %}
-                  <a href="{{ url_for('get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}" id="btnGroupDrop1{{format.format|lower}}" class="btn btn-primary" role="button">
+                  <a href="{{ url_for('web.get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}" id="btnGroupDrop1{{format.format|lower}}" class="btn btn-primary" role="button">
                     <span class="glyphicon glyphicon-download"></span>{{format.format}} ({{ format.uncompressed_size|filesizeformat }})
                   </a>
                   {% endfor %}
@@ -33,7 +33,7 @@
                   </button>
                   <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                   {% for format in entry.data %}
-                    <li><a href="{{ url_for('get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}">{{format.format}} ({{ format.uncompressed_size|filesizeformat }})</a></li>
+                    <li><a href="{{ url_for('web.get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}">{{format.format}} ({{ format.uncompressed_size|filesizeformat }})</a></li>
                   {% endfor %}
                   </ul>
                 {% endif %}
@@ -42,7 +42,7 @@
           {% endif %}
             {% if g.user.kindle_mail and g.user.is_authenticated and kindle_list %}
               {% if kindle_list.__len__() == 1 %}
-                <a href="{{url_for('send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" id="sendbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</a>
+                <a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" id="sendbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</a>
               {% else %}
                 <div class="btn-group" role="group">
                   <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -51,7 +51,7 @@
                   </button>
                     <ul class="dropdown-menu" aria-labelledby="send-to-kindle">
                     {% for format in kindle_list %}
-                      <li><a href="{{url_for('send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
+                      <li><a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
                     {%endfor%}
                     </ul>
                 </div>
@@ -66,14 +66,14 @@
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="read-in-browser">
                     {% for format in reader_list %}
-                      <li><a target="_blank" href="{{ url_for('read_book', book_id=entry.id, book_format=format) }}">{{format}}</a></li>
+                      <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format) }}">{{format}}</a></li>
                     {%endfor%}
                     </ul>
                   <ul class="dropdown-menu" aria-labelledby="listen-in-browser">
 
               {% for format in entry.data %}
                   {% if format.format|lower in audioentries %}
-                    <li><a target="_blank" href="{{ url_for('read_book', book_id=entry.id, book_format=format.format|lower) }}">{{format.format}}</a></li>
+                    <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format.format|lower) }}">{{format.format}}</a></li>
                     {% endif %}
               {% endfor %}
                   </ul>
@@ -86,7 +86,7 @@
       <h2 id="title">{{entry.title|shortentitle(40)}}</h2>
       <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('author', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
+            <a href="{{url_for('web.author', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
@@ -108,7 +108,7 @@
       {% endif %}
 
       {% if entry.series|length > 0 %}
-        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('series', book_id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
+        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('web.series', book_id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
       {% endif %}
 
       {% if entry.languages.__len__() > 0 %}
@@ -137,7 +137,7 @@
         <span class="glyphicon glyphicon-tags"></span>
 
         {% for tag in entry.tags %}
-          <a href="{{ url_for('category', book_id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
+          <a href="{{ url_for('web.category', book_id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
         {%endfor%}
       </p>
 
@@ -148,7 +148,7 @@
       <div class="publishers">
         <p>
           <span>{{_('Publisher')}}:
-              <a href="{{url_for('publisher', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
+              <a href="{{url_for('web.publisher', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
           </span>
         </p>
       </div>
@@ -191,7 +191,7 @@
 
         <div class="custom_columns">
           <p>
-          <form id="have_read_form" action="{{ url_for('toggle_read', book_id=entry.id)}}" method="POST">
+          <form id="have_read_form" action="{{ url_for('web.toggle_read', book_id=entry.id)}}" method="POST">
             <label class="block-label">
               <input id="have_read_cb" type="checkbox" {% if have_read %}checked{% endif %} >
               <span>{{_('Read')}}</span>
@@ -224,8 +224,8 @@
             {% for shelf in g.user.shelf %}
               {% if not shelf.id in books_shelfs and shelf.is_public != 1 %}
                 <li>
-                  <a href="{{ url_for('add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                     data-remove-href="{{ url_for('remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                  <a href="{{ url_for('web.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                     data-remove-href="{{ url_for('web.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-shelf-action="add"
                   >
                     {{shelf.name}}
@@ -236,8 +236,8 @@
             {% for shelf in g.public_shelfes %}
               {% if not shelf.id in books_shelfs %}
                 <li>
-                  <a href="{{ url_for('add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                     data-remove-href="{{ url_for('remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                  <a href="{{ url_for('web.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                     data-remove-href="{{ url_for('web.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-shelf-action="add"
                   >
                     {{shelf.name}}
@@ -251,8 +251,8 @@
           {% if books_shelfs %}
             {% for shelf in g.user.shelf %}
               {% if shelf.id in books_shelfs and shelf.is_public != 1 %}
-                <a href="{{ url_for('remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                   data-add-href="{{ url_for('add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                <a href="{{ url_for('web.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                   data-add-href="{{ url_for('web.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
                   <span class="glyphicon glyphicon-remove"></span> {{shelf.name}}
@@ -261,8 +261,8 @@
             {%endfor%}
             {% for shelf in g.public_shelfes %}
               {% if shelf.id in books_shelfs %}
-                <a href="{{ url_for('remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                   data-add-href="{{ url_for('add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                <a href="{{ url_for('web.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                   data-add-href="{{ url_for('web.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
                   <span class="glyphicon glyphicon-remove"></span> {{shelf.name}}
@@ -279,7 +279,7 @@
       {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
-          <a href="{{ url_for('edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit metadata')}}</a>
+          <a href="{{ url_for('web.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit metadata')}}</a>
         </div>
       </div>
       {% endif %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 306989d6..bdfc2fc6 100755
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -8,21 +8,21 @@
     {% for entry in random %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
-          <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             {% if entry.has_cover %}
-              <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
             {% else %}
               <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
             {% endif %}
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
           <p class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+            <a href="{{url_for('web.author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
@@ -53,21 +53,21 @@
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
-          <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             {% if entry.has_cover %}
-              <img src="{{ url_for('get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
+              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
             {% else %}
               <img src="{{ url_for('static', filename='generic_cover.jpg') }}" alt="{{ entry.title }}" />
             {% endif %}
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
           <p class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+            <a href="{{url_for('web.author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 5a340672..cc55cce5 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -35,10 +35,10 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="{{url_for('index')}}">{{instance}}</a>
+          <a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
         </div>
         {% if g.user.is_authenticated or g.user.is_anonymous %}
-          <form class="navbar-form navbar-left" role="search" action="{{url_for('search')}}" method="GET">
+          <form class="navbar-form navbar-left" role="search" action="{{url_for('web.search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
               <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search')}}">
@@ -51,7 +51,7 @@
         <div class="navbar-collapse collapse">
           {% if g.user.is_authenticated or g.user.is_anonymous %}
           <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
+            <li><a href="{{url_for('web.advanced_search')}}"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
@@ -59,7 +59,7 @@
               {% if g.user.role_upload() or g.user.role_admin()%}
                 {% if g.allow_upload %}
                   <li>
-                    <form id="form-upload" class="navbar-form" action="{{ url_for('upload') }}" method="post" enctype="multipart/form-data">
+                    <form id="form-upload" class="navbar-form" action="{{ url_for('web.upload') }}" method="post" enctype="multipart/form-data">
                       <div class="form-group">
                         <span class="btn btn-default btn-file">{{_('Upload')}}<input id="btn-upload" name="btn-upload" type="file" multiple></span>
                       </div>
@@ -68,19 +68,19 @@
                 {% endif %}
               {% endif %}
               {% if not g.user.is_anonymous %}
-                <li><a id="top_tasks" href="{{url_for('get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span><span class="hidden-sm"> {{_('Tasks')}}</span></a></li>
+                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span><span class="hidden-sm"> {{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
-                <li><a id="top_admin" href="{{url_for('admin')}}"><span class="glyphicon glyphicon-dashboard"></span><span class="hidden-sm"> {{_('Admin')}}</span></a></li>
+                <li><a id="top_admin" href="{{url_for('web.admin')}}"><span class="glyphicon glyphicon-dashboard"></span><span class="hidden-sm"> {{_('Admin')}}</span></a></li>
               {% endif %}
-              <li><a id="top_user" href="{{url_for('profile')}}"><span class="glyphicon glyphicon-user"></span><span class="hidden-sm"> {{g.user.nickname}}</span></a></li>
+              <li><a id="top_user" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span><span class="hidden-sm"> {{g.user.nickname}}</span></a></li>
               {% if not g.user.is_anonymous %}
-              <li><a id="logout" href="{{url_for('logout')}}"><span class="glyphicon glyphicon-log-out"></span><span class="hidden-sm"> {{_('Logout')}}</span></a></li>
+              <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span><span class="hidden-sm"> {{_('Logout')}}</span></a></li>
               {% endif %}
             {% endif %}
             {% if g.allow_registration and not g.user.is_authenticated %}
-            <li><a id="login" href="{{url_for('login')}}"><span class="glyphicon glyphicon-log-in"></span> {{_('Login')}}</a></li>
-            <li><a id="register" href="{{url_for('register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a></li>
+            <li><a id="login" href="{{url_for('web.login')}}"><span class="glyphicon glyphicon-log-in"></span> {{_('Login')}}</a></li>
+            <li><a id="register" href="{{url_for('web.register')}}"><span class="glyphicon glyphicon-user"></span> {{_('Register')}}</a></li>
             {% endif %}
           </ul>
         </div><!--/.nav-collapse -->
@@ -119,7 +119,7 @@
             <ul class="list-unstyled" id="scnd-nav" intent in-standard-append="nav.navigation" in-mobile-after="#main-nav" in-mobile-class="nav navbar-nav">
               <li class="nav-head hidden-xs">{{_('Browse')}}</li>
               {% if g.user.show_recent() %}
-              <li id="nav_new" {% if page == 'root' %}class="active"{% endif %}><a href="{{url_for('index')}}"><span class="glyphicon glyphicon-book"></span> {{_('Recently Added')}}</a></li>
+              <li id="nav_new" {% if page == 'root' %}class="active"{% endif %}><a href="{{url_for('web.index')}}"><span class="glyphicon glyphicon-book"></span> {{_('Recently Added')}}</a></li>
               {%endif%}
               {% if g.user.show_sorted() %}
               <li id="nav_sort" class="dropdown">
@@ -128,55 +128,55 @@
                   <span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu">
-                  <li id="nav_sort_old" {% if page == 'newest' %}class="active"{% endif %}><a href="{{url_for('newest_books')}}">{{_('Sort By')}} {{_('Newest')}}</a></li>
-                  <li id="nav_sort_new" {% if page == 'oldest' %}class="active"{% endif %}><a href="{{url_for('oldest_books')}}">{{_('Sort By')}} {{_('Oldest')}}</a></li>
-                  <li id="nav_sort_asc" {% if page == 'a-z' %}class="active"{% endif %}><a href="{{url_for('titles_ascending')}}">{{_('Sort By')}} {{_('Title')}} ({{_('Ascending')}})</a></li>
-                  <li id="nav_sort_desc" {% if page == 'z-a' %}class="active"{% endif %}><a href="{{url_for('titles_descending')}}">{{_('Sort By')}} {{_('Title')}}  ({{_('Descending')}})</a></li>
+                  <li id="nav_sort_old" {% if page == 'newest' %}class="active"{% endif %}><a href="{{url_for('web.newest_books')}}">{{_('Sort By')}} {{_('Newest')}}</a></li>
+                  <li id="nav_sort_new" {% if page == 'oldest' %}class="active"{% endif %}><a href="{{url_for('web.oldest_books')}}">{{_('Sort By')}} {{_('Oldest')}}</a></li>
+                  <li id="nav_sort_asc" {% if page == 'a-z' %}class="active"{% endif %}><a href="{{url_for('web.titles_ascending')}}">{{_('Sort By')}} {{_('Title')}} ({{_('Ascending')}})</a></li>
+                  <li id="nav_sort_desc" {% if page == 'z-a' %}class="active"{% endif %}><a href="{{url_for('web.titles_descending')}}">{{_('Sort By')}} {{_('Title')}}  ({{_('Descending')}})</a></li>
                 </ul>
               </li>
               {%endif%}
               {% if g.user.show_hot_books() %}
-              <li id="nav_hot" {% if page == 'hot' %}class="active"{% endif %}><a href="{{url_for('hot_books')}}"><span class="glyphicon glyphicon-fire"></span>{{_('Hot Books')}}</a></li>
+              <li id="nav_hot" {% if page == 'hot' %}class="active"{% endif %}><a href="{{url_for('web.hot_books')}}"><span class="glyphicon glyphicon-fire"></span>{{_('Hot Books')}}</a></li>
               {%endif%}
               {% if g.user.show_best_rated_books() %}
-              <li id="nav_rated" {% if page == 'rated' %}class="active"{% endif %}><a href="{{url_for('best_rated_books')}}"><span class="glyphicon glyphicon-star"></span>{{_('Best rated Books')}}</a></li>
+              <li id="nav_rated" {% if page == 'rated' %}class="active"{% endif %}><a href="{{url_for('web.best_rated_books')}}"><span class="glyphicon glyphicon-star"></span>{{_('Best rated Books')}}</a></li>
               {%endif%}
               {% if g.user.show_read_and_unread() %}
                 {% if not g.user.is_anonymous %}
-                  <li id="nav_read" {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('read_books')}}"><span class="glyphicon glyphicon-eye-open"></span>{{_('Read Books')}}</a></li>
+                  <li id="nav_read" {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('web.read_books')}}"><span class="glyphicon glyphicon-eye-open"></span>{{_('Read Books')}}</a></li>
                 {%endif%}
-                <li id="nav_unread" {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('unread_books')}}"><span class="glyphicon glyphicon-eye-close"></span>{{_('Unread Books')}}</a></li>
+                <li id="nav_unread" {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('web.unread_books')}}"><span class="glyphicon glyphicon-eye-close"></span>{{_('Unread Books')}}</a></li>
               {%endif%}
               {% if g.user.show_random_books() %}
-              <li id="nav_rand" {% if page == 'discover' %}class="active"{% endif %}><a href="{{url_for('discover')}}"><span class="glyphicon glyphicon-random"></span>{{_('Discover')}}</a></li>
+              <li id="nav_rand" {% if page == 'discover' %}class="active"{% endif %}><a href="{{url_for('web.discover')}}"><span class="glyphicon glyphicon-random"></span>{{_('Discover')}}</a></li>
               {%endif%}
               {% if g.user.show_category() %}
-              <li id="nav_cat" {% if page == 'discover' %}class="category"{% endif %}><a href="{{url_for('category_list')}}"><span class="glyphicon glyphicon-inbox"></span>{{_('Categories')}}</a></li>
+              <li id="nav_cat" {% if page == 'discover' %}class="category"{% endif %}><a href="{{url_for('web.category_list')}}"><span class="glyphicon glyphicon-inbox"></span>{{_('Categories')}}</a></li>
               {%endif%}
               {% if g.user.show_series() %}
-              <li id="nav_serie" {% if page == 'series' %}class="active"{% endif %}><a href="{{url_for('series_list')}}"><span class="glyphicon glyphicon-bookmark"></span>{{_('Series')}}</a></li>
+              <li id="nav_serie" {% if page == 'series' %}class="active"{% endif %}><a href="{{url_for('web.series_list')}}"><span class="glyphicon glyphicon-bookmark"></span>{{_('Series')}}</a></li>
               {%endif%}
               {% if g.user.show_author() %}
-              <li id="nav_author" {% if page == 'author' %}class="active"{% endif %}><a href="{{url_for('author_list')}}"><span class="glyphicon glyphicon-user"></span>{{_('Authors')}}</a></li>
+              <li id="nav_author" {% if page == 'author' %}class="active"{% endif %}><a href="{{url_for('web.author_list')}}"><span class="glyphicon glyphicon-user"></span>{{_('Authors')}}</a></li>
               {%endif%}
               {% if g.user.show_publisher() %}
-              <li id="nav_publisher" {% if page == 'publisher' %}class="active"{% endif %}><a href="{{url_for('publisher_list')}}"><span class="glyphicon glyphicon-text-size"></span>{{_('Publishers')}}</a></li>
+              <li id="nav_publisher" {% if page == 'publisher' %}class="active"{% endif %}><a href="{{url_for('web.publisher_list')}}"><span class="glyphicon glyphicon-text-size"></span>{{_('Publishers')}}</a></li>
               {%endif%}
               {% if g.user.filter_language() == 'all' and g.user.show_language() %}
-                <li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('language_overview')}}"><span class="glyphicon glyphicon-flag"></span>{{_('Languages')}} </a></li>
+                <li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('web.language_overview')}}"><span class="glyphicon glyphicon-flag"></span>{{_('Languages')}} </a></li>
               {%endif%}
               {% if g.user.is_authenticated or g.user.is_anonymous %}
                 <li class="nav-head hidden-xs public-shelves">{{_('Public Shelves')}}</li>
                 {% for shelf in g.public_shelfes %}
-                  <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
+                  <li><a href="{{url_for('web.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
                 {% endfor %}
                 <li class="nav-head hidden-xs your-shelves">{{_('Your Shelves')}}</li>
                 {% for shelf in g.user.shelf %}
-                  <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
+                  <li><a href="{{url_for('web.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
                 {% endfor %}
               {% if not g.user.is_anonymous %}
-                <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('create_shelf')}}">{{_('Create a Shelf')}}</a></li>
-                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('stats')}}"><span class="glyphicon glyphicon-info-sign"></span>{{_('About')}}</a></li>
+                <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('web.create_shelf')}}">{{_('Create a Shelf')}}</a></li>
+                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('web.stats')}}"><span class="glyphicon glyphicon-info-sign"></span>{{_('About')}}</a></li>
               {% endif %}
               {% endif %}
 
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index a0eca539..4cb20a02 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="col-sm-8">
-  <form role="form" id="search" action="{{ url_for('advanced_search') }}" method="GET">
+  <form role="form" id="search" action="{{ url_for('web.advanced_search') }}" method="GET">
     <div class="form-group">
       <label for="book_title">{{_('Book Title')}}</label>
       <input type="text" class="form-control" name="book_title" id="book_title" value="">
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 4cf13c95..2f2c37c5 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -5,7 +5,7 @@
 {% block body %}
 <div class="discover">
     <h2>{{_('Tasks list')}}</h2>
-    <table class="table table-no-bordered" id="table" data-url="{{  url_for('get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc">
+    <table class="table table-no-bordered" id="table" data-url="{{  url_for('web.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc">
       <thead>
         <tr>
             {% if g.user.role_admin() %}
@@ -38,7 +38,7 @@
             setInterval(function() {
                 $.ajax({
                     method:"get",
-                    url: "{{ url_for('get_email_status_json')}}",
+                    url: "{{ url_for('web.get_email_status_json')}}",
                     async: true,
                     timeout: 900,
                     success:function(data){
diff --git a/cps/ub.py b/cps/ub.py
index 541b12bf..177f9ce9 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -23,7 +23,6 @@ from sqlalchemy import exc
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import *
 from flask_login import AnonymousUserMixin
-from flask_dance.consumer.backend.sqla import OAuthConsumerMixin
 import sys
 import os
 import logging
@@ -69,6 +68,10 @@ AUTO_UPDATE_STABLE = 1
 UPDATE_NIGHTLY = 2
 AUTO_UPDATE_NIGHTLY = 4
 
+engine = create_engine('sqlite:///{0}'.format(cli.settingspath), echo=False)
+Base = declarative_base()
+
+
 class UserBase:
 
     @property
@@ -171,13 +174,13 @@ class UserBase:
         return '<User %r>' % self.nickname
 
     #Login via LDAP method
-    @staticmethod
+    ''''@staticmethod
     def try_login(username, password):
         conn = get_ldap_connection()
         conn.simple_bind_s(
              config.config_ldap_dn.replace("%s", username),
              password
-        )
+        )'''
 
 # Baseclass for Users in Calibre-Web, settings which are depending on certain users are stored here. It is derived from
 # User Base (all access methods are declared there)
@@ -197,11 +200,11 @@ class User(UserBase, Base):
     default_language = Column(String(3), default="all")
     mature_content = Column(Boolean, default=True)
 
-
+'''
 class OAuth(OAuthConsumerMixin, Base):
     provider_user_id = Column(String(256))
     user_id = Column(Integer, ForeignKey(User.id))
-    user = relationship(User)
+    user = relationship(User)'''
 
 
 # Class for anonymous user is derived from User base and completly overrides methods and properties for the
@@ -815,7 +818,7 @@ def delete_download(book_id):
     session.commit()
 
 # Generate user Guest (translated text), as anoymous user, no rights
-def create_anonymous_user():
+def create_anonymous_user(session):
     user = User()
     user.nickname = "Guest"
     user.email = 'no@email'
@@ -852,7 +855,7 @@ Session = sessionmaker()
 Session.configure(bind=engine)
 session = Session()
 
-# generate database and admin and guest user, if no database is existing
+
 if not os.path.exists(cli.settingspath):
     try:
         Base.metadata.create_all(engine)
@@ -865,13 +868,3 @@ else:
     Base.metadata.create_all(engine)
     migrate_Database()
     clean_database()
-
-#get LDAP connection
-def get_ldap_connection():
-    import ldap
-    conn = ldap.initialize('ldap://{}'.format(config.config_ldap_provider_url))
-    return conn
-
-# Generate global Settings Object accessible from every file
-config = Config()
-searched_ids = {}
diff --git a/cps/updater.py b/cps/updater.py
index 1e0b8115..91d86660 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -28,7 +28,8 @@ from io import BytesIO
 import os
 import sys
 import shutil
-from ub import config, UPDATE_STABLE
+from cps import config
+from ub import UPDATE_STABLE
 from tempfile import gettempdir
 import datetime
 import json
diff --git a/cps/web.py b/cps/web.py
index 8f406d3e..36728b7c 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -23,30 +23,23 @@
 
 import mimetypes
 import logging
-from logging.handlers import RotatingFileHandler
 from flask import (Flask, session, render_template, request, Response, redirect,
                    url_for, send_from_directory, make_response, g, flash,
                    abort, Markup)
 from flask import __version__ as flaskVersion
 from werkzeug import __version__ as werkzeugVersion
-from werkzeug.exceptions import default_exceptions
+# from werkzeug.exceptions import default_exceptions
 
 from jinja2 import __version__  as jinja2Version
-import cache_buster
-import ub
-from ub import config
 import helper
 import os
-from sqlalchemy.sql.expression import func
-from sqlalchemy.sql.expression import false
+# from sqlalchemy.sql.expression import func
+# from sqlalchemy.sql.expression import false
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import __version__ as sqlalchemyVersion
-from math import ceil
-from flask_login import (LoginManager, login_user, logout_user,
+from flask_login import (login_user, logout_user,
                          login_required, current_user)
-from flask_principal import Principal
 from flask_principal import __version__ as flask_principalVersion
-from flask_babel import Babel
 from flask_babel import gettext as _
 import requests
 from werkzeug.security import generate_password_hash, check_password_hash
@@ -76,14 +69,16 @@ import tempfile
 from redirect import redirect_back
 import time
 import server
-from reverseproxy import ReverseProxied
 from updater import updater_thread
-from flask_dance.contrib.github import make_github_blueprint, github
-from flask_dance.contrib.google import make_google_blueprint, google
-from flask_dance.consumer import oauth_authorized, oauth_error
-from sqlalchemy.orm.exc import NoResultFound
-from oauth import OAuthBackend
+#from flask_dance.contrib.github import make_github_blueprint, github
+#from flask_dance.contrib.google import make_google_blueprint, google
+#from flask_dance.consumer import oauth_authorized, oauth_error
+#from sqlalchemy.orm.exc import NoResultFound
+# from oauth import OAuthBackend
 import hashlib
+from cps import lm, babel, ub_session, config, Server
+import ub
+from pagination import Pagination
 
 try:
     from googleapiclient.errors import HttpError
@@ -139,8 +134,6 @@ except ImportError:
 current_milli_time = lambda: int(round(time.time() * 1000))
 gdrive_watch_callback_token = 'target=calibreweb-watch_files'
 # ToDo: Somehow caused by circular import under python3 refactor
-py3_gevent_link = None
-py3_restart_Typ = False
 EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
                       'fb2', 'html', 'rtf', 'odt', 'mp3',  'm4a', 'm4b'}
 EXTENSIONS_CONVERT = {'pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'html', 'rtf', 'odt'}
@@ -174,7 +167,7 @@ mimetypes.add_type('application/ogg', '.oga')
 
 app = (Flask(__name__))
 
-# custom error page
+''''# custom error page
 def error_http(error):
     return render_template('http_error.html',
                             error_code=error.code,
@@ -188,39 +181,15 @@ for ex in default_exceptions:
     if ex < 500:
         app.register_error_handler(ex, error_http)
 
-app.wsgi_app = ReverseProxied(app.wsgi_app)
-cache_buster.init_cache_busting(app)
-
-formatter = logging.Formatter(
-    "[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s")
-try:
-    file_handler = RotatingFileHandler(config.get_config_logfile(), maxBytes=50000, backupCount=2)
-except IOError:
-    file_handler = RotatingFileHandler(os.path.join(config.get_main_dir, "calibre-web.log"),
-                                       maxBytes=50000, backupCount=2)
-    # ToDo: reset logfile value in config class
-file_handler.setFormatter(formatter)
-app.logger.addHandler(file_handler)
-app.logger.setLevel(config.config_log_level)
 
-app.logger.info('Starting Calibre Web...')
-logging.getLogger("book_formats").addHandler(file_handler)
-logging.getLogger("book_formats").setLevel(config.config_log_level)
 
-Principal(app)
-babel = Babel(app)
+# import uploader
 
-import uploader
+'''
 
-lm = LoginManager(app)
-lm.init_app(app)
-lm.login_view = 'login'
-lm.anonymous_user = ub.Anonymous
-app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
-db.setup_db()
+from flask import Blueprint
 
-with open(os.path.join(config.get_main_dir, 'cps/translations/iso639.pickle'), 'rb') as f:
-    language_table = cPickle.load(f)
+web = Blueprint('web', __name__)
 
 
 def is_gdrive_ready():
@@ -256,8 +225,10 @@ def get_timezone():
 
 @lm.user_loader
 def load_user(user_id):
-    return ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
-
+    try:
+        return ub_session.query(ub.User).filter(ub.User.id == int(user_id)).first()
+    except Exception as e:
+        print(e)
 
 @lm.header_loader
 def load_user_from_header(header_val):
@@ -300,58 +271,6 @@ def requires_basic_auth_if_no_ano(f):
     return decorated
 
 
-# simple pagination for the feed
-class Pagination(object):
-    def __init__(self, page, per_page, total_count):
-        self.page = int(page)
-        self.per_page = int(per_page)
-        self.total_count = int(total_count)
-
-    @property
-    def next_offset(self):
-        return int(self.page * self.per_page)
-
-    @property
-    def previous_offset(self):
-        return int((self.page - 2) * self.per_page)
-
-    @property
-    def last_offset(self):
-        last = int(self.total_count) - int(self.per_page)
-        if last < 0:
-            last = 0
-        return int(last)
-
-    @property
-    def pages(self):
-        return int(ceil(self.total_count / float(self.per_page)))
-
-    @property
-    def has_prev(self):
-        return self.page > 1
-
-    @property
-    def has_next(self):
-        return self.page < self.pages
-
-    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shwn
-    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shwn
-    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shwn
-    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shwn
-    def iter_pages(self, left_edge=2, left_current=2,
-                   right_current=4, right_edge=2):
-        last = 0
-        left_current = self.page - left_current - 1
-        right_current = self.page + right_current + 1
-        right_edge = self.pages - right_edge
-        for num in range(1, (self.pages + 1)):
-            if num <= left_edge or (left_current < num < right_current) or num > right_edge:
-                if last + 1 != num:
-                    yield None
-                yield num
-                last = num
-
-
 def login_required_if_no_ano(func):
     @wraps(func)
     def decorated_view(*args, **kwargs):
@@ -408,7 +327,7 @@ def google_oauth_required(f):
 # custom jinja filters
 
 # pagination links in jinja
-@app.template_filter('url_for_other_page')
+@web.app_template_filter('url_for_other_page')
 def url_for_other_page(page):
     args = request.view_args.copy()
     args['page'] = page
@@ -416,7 +335,7 @@ def url_for_other_page(page):
 
 
 # shortentitles to at longest nchar, shorten longer words if necessary
-@app.template_filter('shortentitle')
+@web.app_template_filter('shortentitle')
 def shortentitle_filter(s, nchar=20):
     text = s.split()
     res = ""  # result
@@ -436,7 +355,7 @@ def shortentitle_filter(s, nchar=20):
     return res.strip()
 
 
-@app.template_filter('mimetype')
+@web.app_template_filter('mimetype')
 def mimetype_filter(val):
     try:
         s = mimetypes.types_map['.' + val]
@@ -445,14 +364,14 @@ def mimetype_filter(val):
     return s
 
 
-@app.template_filter('formatdate')
+@web.app_template_filter('formatdate')
 def formatdate_filter(val):
     conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
     formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
     return format_date(formatdate, format='medium', locale=get_locale())
 
 
-@app.template_filter('formatdateinput')
+@web.app_template_filter('formatdateinput')
 def format_date_input(val):
     conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
     date_obj = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
@@ -460,7 +379,7 @@ def format_date_input(val):
     return '' if input_date == "0101-01-01" else input_date
 
 
-@app.template_filter('strftime')
+@web.app_template_filter('strftime')
 def timestamptodate(date, fmt=None):
     date = datetime.datetime.fromtimestamp(
         int(date)/1000
@@ -473,12 +392,12 @@ def timestamptodate(date, fmt=None):
     return native.strftime(time_format)
 
 
-@app.template_filter('yesno')
+@web.app_template_filter('yesno')
 def yesno(value, yes, no):
     return yes if value else no
 
 
-'''@app.template_filter('canread')
+'''@web.app_template_filter('canread')
 def canread(ext):
     if isinstance(ext, db.Data):
         ext = ext.format
@@ -748,44 +667,44 @@ def render_title_template(*args, **kwargs):
     return render_template(instance=config.config_calibre_web_title, *args, **kwargs)
 
 
-@app.before_request
+@web.before_request
 def before_request():
     g.user = current_user
     g.allow_registration = config.config_public_reg
     g.allow_upload = config.config_uploading
     g.current_theme = config.config_theme
     g.public_shelfes = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1).order_by(ub.Shelf.name).all()
-    if not config.db_configured and request.endpoint not in ('basic_configuration', 'login') and '/static/' not in request.path:
-        return redirect(url_for('basic_configuration'))
+    if not config.db_configured and request.endpoint not in ('web.basic_configuration', 'login') and '/static/' not in request.path:
+        return redirect(url_for('web.basic_configuration'))
 
 
 # Routing functions
 
-@app.route("/opds")
+@web.route("/opds")
 @requires_basic_auth_if_no_ano
 def feed_index():
     return render_xml_template('index.xml')
 
 
-@app.route("/opds/osd")
+@web.route("/opds/osd")
 @requires_basic_auth_if_no_ano
 def feed_osd():
     return render_xml_template('osd.xml', lang='en-EN')
 
 
-@app.route("/opds/search/<query>")
+@web.route("/opds/search/<query>")
 @requires_basic_auth_if_no_ano
 def feed_cc_search(query):
     return feed_search(query.strip())
 
 
-@app.route("/opds/search", methods=["GET"])
+@web.route("/opds/search", methods=["GET"])
 @requires_basic_auth_if_no_ano
 def feed_normal_search():
     return feed_search(request.args.get("query").strip())
 
 
-@app.route("/opds/new")
+@web.route("/opds/new")
 @requires_basic_auth_if_no_ano
 def feed_new():
     off = request.args.get("offset") or 0
@@ -794,7 +713,7 @@ def feed_new():
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/discover")
+@web.route("/opds/discover")
 @requires_basic_auth_if_no_ano
 def feed_discover():
     entries = db.session.query(db.Books).filter(common_filters()).order_by(func.random())\
@@ -803,7 +722,7 @@ def feed_discover():
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/rated")
+@web.route("/opds/rated")
 @requires_basic_auth_if_no_ano
 def feed_best_rated():
     off = request.args.get("offset") or 0
@@ -812,7 +731,7 @@ def feed_best_rated():
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/hot")
+@web.route("/opds/hot")
 @requires_basic_auth_if_no_ano
 def feed_hot():
     off = request.args.get("offset") or 0
@@ -837,7 +756,7 @@ def feed_hot():
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/author")
+@web.route("/opds/author")
 @requires_basic_auth_if_no_ano
 def feed_authorindex():
     off = request.args.get("offset") or 0
@@ -848,7 +767,7 @@ def feed_authorindex():
     return render_xml_template('feed.xml', listelements=entries, folder='feed_author', pagination=pagination)
 
 
-@app.route("/opds/author/<int:book_id>")
+@web.route("/opds/author/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_author(book_id):
     off = request.args.get("offset") or 0
@@ -857,7 +776,7 @@ def feed_author(book_id):
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/publisher")
+@web.route("/opds/publisher")
 @requires_basic_auth_if_no_ano
 def feed_publisherindex():
     off = request.args.get("offset") or 0
@@ -868,7 +787,7 @@ def feed_publisherindex():
     return render_xml_template('feed.xml', listelements=entries, folder='feed_publisher', pagination=pagination)
 
 
-@app.route("/opds/publisher/<int:book_id>")
+@web.route("/opds/publisher/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_publisher(book_id):
     off = request.args.get("offset") or 0
@@ -878,7 +797,7 @@ def feed_publisher(book_id):
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/category")
+@web.route("/opds/category")
 @requires_basic_auth_if_no_ano
 def feed_categoryindex():
     off = request.args.get("offset") or 0
@@ -889,7 +808,7 @@ def feed_categoryindex():
     return render_xml_template('feed.xml', listelements=entries, folder='feed_category', pagination=pagination)
 
 
-@app.route("/opds/category/<int:book_id>")
+@web.route("/opds/category/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_category(book_id):
     off = request.args.get("offset") or 0
@@ -898,7 +817,7 @@ def feed_category(book_id):
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/series")
+@web.route("/opds/series")
 @requires_basic_auth_if_no_ano
 def feed_seriesindex():
     off = request.args.get("offset") or 0
@@ -909,7 +828,7 @@ def feed_seriesindex():
     return render_xml_template('feed.xml', listelements=entries, folder='feed_series', pagination=pagination)
 
 
-@app.route("/opds/series/<int:book_id>")
+@web.route("/opds/series/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_series(book_id):
     off = request.args.get("offset") or 0
@@ -918,8 +837,8 @@ def feed_series(book_id):
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-@app.route("/opds/shelfindex/", defaults={'public': 0})
-@app.route("/opds/shelfindex/<string:public>")
+@web.route("/opds/shelfindex/", defaults={'public': 0})
+@web.route("/opds/shelfindex/<string:public>")
 @requires_basic_auth_if_no_ano
 def feed_shelfindex(public):
     off = request.args.get("offset") or 0
@@ -934,7 +853,7 @@ def feed_shelfindex(public):
     return render_xml_template('feed.xml', listelements=shelf, folder='feed_shelf', pagination=pagination)
 
 
-@app.route("/opds/shelf/<int:book_id>")
+@web.route("/opds/shelf/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_shelf(book_id):
     off = request.args.get("offset") or 0
@@ -958,7 +877,7 @@ def feed_shelf(book_id):
         return render_xml_template('feed.xml', entries=result, pagination=pagination)
 
 
-@app.route("/opds/download/<book_id>/<book_format>/")
+@web.route("/opds/download/<book_id>/<book_format>/")
 @requires_basic_auth_if_no_ano
 @download_required
 def get_opds_download_link(book_id, book_format):
@@ -982,7 +901,7 @@ def get_opds_download_link(book_id, book_format):
     return helper.do_download_file(book, book_format, data, headers)
 
 
-@app.route("/ajax/book/<string:uuid>")
+@web.route("/ajax/book/<string:uuid>")
 @requires_basic_auth_if_no_ano
 def get_metadata_calibre_companion(uuid):
     entry = db.session.query(db.Books).filter(db.Books.uuid.like("%" + uuid + "%")).first()
@@ -994,7 +913,7 @@ def get_metadata_calibre_companion(uuid):
     else:
         return ""
 
-@app.route("/ajax/emailstat")
+@web.route("/ajax/emailstat")
 @login_required
 def get_email_status_json():
     tasks=helper.global_WorkerThread.get_taskstatus()
@@ -1015,7 +934,7 @@ def check_valid_domain(domain_text):
     return len(result)
 
 
-@app.route("/ajax/editdomain", methods=['POST'])
+@web.route("/ajax/editdomain", methods=['POST'])
 @login_required
 @admin_required
 def edit_domain():
@@ -1031,7 +950,7 @@ def edit_domain():
     return ""
 
 
-@app.route("/ajax/adddomain", methods=['POST'])
+@web.route("/ajax/adddomain", methods=['POST'])
 @login_required
 @admin_required
 def add_domain():
@@ -1044,7 +963,7 @@ def add_domain():
     return ""
 
 
-@app.route("/ajax/deletedomain", methods=['POST'])
+@web.route("/ajax/deletedomain", methods=['POST'])
 @login_required
 @admin_required
 def delete_domain():
@@ -1059,7 +978,7 @@ def delete_domain():
     return ""
 
 
-@app.route("/ajax/domainlist")
+@web.route("/ajax/domainlist")
 @login_required
 @admin_required
 def list_domain():
@@ -1072,7 +991,7 @@ def list_domain():
 
 
 '''
-@app.route("/ajax/getcomic/<int:book_id>/<book_format>/<int:page>")
+@web.route("/ajax/getcomic/<int:book_id>/<book_format>/<int:page>")
 @login_required
 def get_comic_book(book_id, book_format, page):
     book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
@@ -1123,7 +1042,7 @@ def get_comic_book(book_id, book_format, page):
 '''
 
 
-@app.route("/get_authors_json", methods=['GET', 'POST'])
+@web.route("/get_authors_json", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_authors_json():
     if request.method == "GET":
@@ -1133,7 +1052,7 @@ def get_authors_json():
         return json_dumps
 
 
-@app.route("/get_publishers_json", methods=['GET', 'POST'])
+@web.route("/get_publishers_json", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_publishers_json():
     if request.method == "GET":
@@ -1143,7 +1062,7 @@ def get_publishers_json():
         return json_dumps
 
 
-@app.route("/get_tags_json", methods=['GET', 'POST'])
+@web.route("/get_tags_json", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_tags_json():
     if request.method == "GET":
@@ -1153,7 +1072,7 @@ def get_tags_json():
         return json_dumps
 
 
-@app.route("/get_languages_json", methods=['GET', 'POST'])
+@web.route("/get_languages_json", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_languages_json():
     if request.method == "GET":
@@ -1169,7 +1088,7 @@ def get_languages_json():
         return json_dumps
 
 
-@app.route("/get_series_json", methods=['GET', 'POST'])
+@web.route("/get_series_json", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_series_json():
     if request.method == "GET":
@@ -1180,7 +1099,7 @@ def get_series_json():
         return json_dumps
 
 
-@app.route("/get_matching_tags", methods=['GET', 'POST'])
+@web.route("/get_matching_tags", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_matching_tags():
     tag_dict = {'tags': []}
@@ -1206,13 +1125,13 @@ def get_matching_tags():
     return json_dumps
 
 
-@app.route("/get_update_status", methods=['GET'])
+@web.route("/get_update_status", methods=['GET'])
 @login_required_if_no_ano
 def get_update_status():
     return updater_thread.get_available_updates(request.method)
 
 
-@app.route("/get_updater_status", methods=['GET', 'POST'])
+@web.route("/get_updater_status", methods=['GET', 'POST'])
 @login_required
 @admin_required
 def get_updater_status():
@@ -1248,8 +1167,8 @@ def get_updater_status():
     return json.dumps(status)
 
 
-@app.route("/", defaults={'page': 1})
-@app.route('/page/<int:page>')
+@web.route("/", defaults={'page': 1})
+@web.route('/page/<int:page>')
 @login_required_if_no_ano
 def index(page):
     entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.timestamp.desc()])
@@ -1257,8 +1176,8 @@ def index(page):
                                  title=_(u"Recently Added Books"), page="root")
 
 
-@app.route('/books/newest', defaults={'page': 1})
-@app.route('/books/newest/page/<int:page>')
+@web.route('/books/newest', defaults={'page': 1})
+@web.route('/books/newest/page/<int:page>')
 @login_required_if_no_ano
 def newest_books(page):
     if current_user.show_sorted():
@@ -1269,8 +1188,8 @@ def newest_books(page):
         abort(404)
 
 
-@app.route('/books/oldest', defaults={'page': 1})
-@app.route('/books/oldest/page/<int:page>')
+@web.route('/books/oldest', defaults={'page': 1})
+@web.route('/books/oldest/page/<int:page>')
 @login_required_if_no_ano
 def oldest_books(page):
     if current_user.show_sorted():
@@ -1281,8 +1200,8 @@ def oldest_books(page):
         abort(404)
 
 
-@app.route('/books/a-z', defaults={'page': 1})
-@app.route('/books/a-z/page/<int:page>')
+@web.route('/books/a-z', defaults={'page': 1})
+@web.route('/books/a-z/page/<int:page>')
 @login_required_if_no_ano
 def titles_ascending(page):
     if current_user.show_sorted():
@@ -1293,8 +1212,8 @@ def titles_ascending(page):
         abort(404)
 
 
-@app.route('/books/z-a', defaults={'page': 1})
-@app.route('/books/z-a/page/<int:page>')
+@web.route('/books/z-a', defaults={'page': 1})
+@web.route('/books/z-a/page/<int:page>')
 @login_required_if_no_ano
 def titles_descending(page):
     entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.sort.desc()])
@@ -1302,8 +1221,8 @@ def titles_descending(page):
                                  title=_(u"Books (Z-A)"), page="z-a")
 
 
-@app.route("/hot", defaults={'page': 1})
-@app.route('/hot/page/<int:page>')
+@web.route("/hot", defaults={'page': 1})
+@web.route('/hot/page/<int:page>')
 @login_required_if_no_ano
 def hot_books(page):
     if current_user.show_hot_books():
@@ -1333,8 +1252,8 @@ def hot_books(page):
        abort(404)
 
 
-@app.route("/rated", defaults={'page': 1})
-@app.route('/rated/page/<int:page>')
+@web.route("/rated", defaults={'page': 1})
+@web.route('/rated/page/<int:page>')
 @login_required_if_no_ano
 def best_rated_books(page):
     if current_user.show_best_rated_books():
@@ -1346,8 +1265,8 @@ def best_rated_books(page):
         abort(404)
 
 
-@app.route("/discover", defaults={'page': 1})
-@app.route('/discover/page/<int:page>')
+@web.route("/discover", defaults={'page': 1})
+@web.route('/discover/page/<int:page>')
 @login_required_if_no_ano
 def discover(page):
     if current_user.show_random_books():
@@ -1359,7 +1278,7 @@ def discover(page):
         abort(404)
 
 
-@app.route("/author")
+@web.route("/author")
 @login_required_if_no_ano
 def author_list():
     if current_user.show_author():
@@ -1374,15 +1293,15 @@ def author_list():
         abort(404)
 
 
-@app.route("/author/<int:book_id>", defaults={'page': 1})
-@app.route("/author/<int:book_id>/<int:page>")
+@web.route("/author/<int:book_id>", defaults={'page': 1})
+@web.route("/author/<int:book_id>/<int:page>")
 @login_required_if_no_ano
 def author(book_id, page):
     entries, __, pagination = fill_indexpage(page, db.Books, db.Books.authors.any(db.Authors.id == book_id),
                                             [db.Series.name, db.Books.series_index],db.books_series_link, db.Series)
     if entries is None:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
     name = (db.session.query(db.Authors).filter(db.Authors.id == book_id).first().name).replace('|', ',')
 
@@ -1401,7 +1320,7 @@ def author(book_id, page):
                                  title=name, author=author_info, other_books=other_books, page="author")
 
 
-@app.route("/publisher")
+@web.route("/publisher")
 @login_required_if_no_ano
 def publisher_list():
     if current_user.show_publisher():
@@ -1414,8 +1333,8 @@ def publisher_list():
         abort(404)
 
 
-@app.route("/publisher/<int:book_id>", defaults={'page': 1})
-@app.route('/publisher/<int:book_id>/<int:page>')
+@web.route("/publisher/<int:book_id>", defaults={'page': 1})
+@web.route('/publisher/<int:book_id>/<int:page>')
 @login_required_if_no_ano
 def publisher(book_id, page):
     publisher = db.session.query(db.Publishers).filter(db.Publishers.id == book_id).first()
@@ -1448,7 +1367,7 @@ def get_unique_other_books(library_books, author_books):
     return other_books
 
 
-@app.route("/series")
+@web.route("/series")
 @login_required_if_no_ano
 def series_list():
     if current_user.show_series():
@@ -1461,8 +1380,8 @@ def series_list():
         abort(404)
 
 
-@app.route("/series/<int:book_id>/", defaults={'page': 1})
-@app.route("/series/<int:book_id>/<int:page>")
+@web.route("/series/<int:book_id>/", defaults={'page': 1})
+@web.route("/series/<int:book_id>/<int:page>")
 @login_required_if_no_ano
 def series(book_id, page):
     name = db.session.query(db.Series).filter(db.Series.id == book_id).first()
@@ -1475,7 +1394,7 @@ def series(book_id, page):
         abort(404)
 
 
-@app.route("/language")
+@web.route("/language")
 @login_required_if_no_ano
 def language_overview():
     if current_user.show_language():
@@ -1501,8 +1420,8 @@ def language_overview():
         abort(404)
 
 
-@app.route("/language/<name>", defaults={'page': 1})
-@app.route('/language/<name>/page/<int:page>')
+@web.route("/language/<name>", defaults={'page': 1})
+@web.route('/language/<name>/page/<int:page>')
 @login_required_if_no_ano
 def language(name, page):
     try:
@@ -1519,7 +1438,7 @@ def language(name, page):
                                  title=_(u"Language: %(name)s", name=lang_name), page="language")
 
 
-@app.route("/category")
+@web.route("/category")
 @login_required_if_no_ano
 def category_list():
     if current_user.show_category():
@@ -1532,8 +1451,8 @@ def category_list():
         abort(404)
 
 
-@app.route("/category/<int:book_id>", defaults={'page': 1})
-@app.route('/category/<int:book_id>/<int:page>')
+@web.route("/category/<int:book_id>", defaults={'page': 1})
+@web.route('/category/<int:book_id>/<int:page>')
 @login_required_if_no_ano
 def category(book_id, page):
     name = db.session.query(db.Tags).filter(db.Tags.id == book_id).first()
@@ -1546,7 +1465,7 @@ def category(book_id, page):
         abort(404)
 
 
-@app.route("/ajax/toggleread/<int:book_id>", methods=['POST'])
+@web.route("/ajax/toggleread/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_read(book_id):
     if not config.config_read_column:
@@ -1580,7 +1499,7 @@ def toggle_read(book_id):
                     u"Custom Column No.%d is not exisiting in calibre database" % config.config_read_column)
     return ""
 
-@app.route("/book/<int:book_id>")
+@web.route("/book/<int:book_id>")
 @login_required_if_no_ano
 def show_book(book_id):
     entries = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
@@ -1642,10 +1561,10 @@ def show_book(book_id):
                                      have_read=have_read, kindle_list=kindle_list, reader_list=reader_list, page="book")
     else:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
 
-@app.route("/ajax/bookmark/<int:book_id>/<book_format>", methods=['POST'])
+@web.route("/ajax/bookmark/<int:book_id>/<book_format>", methods=['POST'])
 @login_required
 def bookmark(book_id, book_format):
     bookmark_key = request.form["bookmark"]
@@ -1665,7 +1584,7 @@ def bookmark(book_id, book_format):
     return "", 201
 
 
-@app.route("/tasks")
+@web.route("/tasks")
 @login_required
 def get_tasks_status():
     # if current user admin, show all email, otherwise only own emails
@@ -1680,13 +1599,13 @@ def get_tasks_status():
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
 
-@app.route("/admin")
+@web.route("/admin")
 @login_required
 def admin_forbidden():
     abort(403)
 
 
-@app.route("/stats")
+@web.route("/stats")
 @login_required
 def stats():
     counter = db.session.query(db.Books).count()
@@ -1714,8 +1633,8 @@ def stats():
                                  categorycounter=categorys, seriecounter=series, title=_(u"Statistics"), page="stat")
 
 
-@app.route("/delete/<int:book_id>/", defaults={'book_format': ""})
-@app.route("/delete/<int:book_id>/<string:book_format>/")
+@web.route("/delete/<int:book_id>/", defaults={'book_format': ""})
+@web.route("/delete/<int:book_id>/<string:book_format>/")
 @login_required
 def delete_book(book_id, book_format):
     if current_user.role_delete_books():
@@ -1772,7 +1691,7 @@ def delete_book(book_id, book_format):
 
 
 
-@app.route("/gdrive/authenticate")
+@web.route("/gdrive/authenticate")
 @login_required
 @admin_required
 def authenticate_google_drive():
@@ -1785,7 +1704,7 @@ def authenticate_google_drive():
     return redirect(authUrl)
 
 
-@app.route("/gdrive/callback")
+@web.route("/gdrive/callback")
 def google_drive_callback():
     auth_code = request.args.get('code')
     if not auth_code:
@@ -1799,7 +1718,7 @@ def google_drive_callback():
     return redirect(url_for('configuration'))
 
 
-@app.route("/gdrive/watch/subscribe")
+@web.route("/gdrive/watch/subscribe")
 @login_required
 @admin_required
 def watch_gdrive():
@@ -1831,7 +1750,7 @@ def watch_gdrive():
     return redirect(url_for('configuration'))
 
 
-@app.route("/gdrive/watch/revoke")
+@web.route("/gdrive/watch/revoke")
 @login_required
 @admin_required
 def revoke_watch_gdrive():
@@ -1850,7 +1769,7 @@ def revoke_watch_gdrive():
     return redirect(url_for('configuration'))
 
 
-@app.route("/gdrive/watch/callback", methods=['GET', 'POST'])
+@web.route("/gdrive/watch/callback", methods=['GET', 'POST'])
 def on_received_watch_confirmation():
     app.logger.debug(request.headers)
     if request.headers.get('X-Goog-Channel-Token') == gdrive_watch_callback_token \
@@ -1886,7 +1805,7 @@ def on_received_watch_confirmation():
     return ''
 
 
-@app.route("/shutdown")
+@web.route("/shutdown")
 @login_required
 @admin_required
 def shutdown():
@@ -1901,12 +1820,12 @@ def shutdown():
         showtext = {}
         if task == 0:
             showtext['text'] = _(u'Server restarted, please reload page')
-            server.Server.setRestartTyp(True)
+            Server.setRestartTyp(True)
         else:
             showtext['text'] = _(u'Performing shutdown of server, please close window')
-            server.Server.setRestartTyp(False)
+            Server.setRestartTyp(False)
         # stop gevent/tornado server
-        server.Server.stopServer()
+        Server.stopServer()
         return json.dumps(showtext)
     else:
         if task == 2:
@@ -1917,7 +1836,7 @@ def shutdown():
         abort(404)
 
 
-@app.route("/search", methods=["GET"])
+@web.route("/search", methods=["GET"])
 @login_required_if_no_ano
 def search():
     term = request.args.get("query").strip().lower()
@@ -1932,7 +1851,7 @@ def search():
         return render_title_template('search.html', searchterm="", page="search")
 
 
-@app.route("/advanced_search", methods=['GET'])
+@web.route("/advanced_search", methods=['GET'])
 @login_required_if_no_ano
 def advanced_search():
     # Build custom columns names
@@ -2079,14 +1998,14 @@ def advanced_search():
                                  series=series, title=_(u"search"), cc=cc, page="advsearch")
 
 
-@app.route("/cover/<book_id>")
+@web.route("/cover/<book_id>")
 @login_required_if_no_ano
 def get_cover(book_id):
     book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
     return helper.get_book_cover(book.path)
 
 
-@app.route("/show/<book_id>/<book_format>")
+@web.route("/show/<book_id>/<book_format>")
 @login_required_if_no_ano
 def serve_book(book_id, book_format):
     book_format = book_format.split(".")[0]
@@ -2105,10 +2024,10 @@ def serve_book(book_id, book_format):
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
-@app.route("/opds/thumb_240_240/<book_id>")
-@app.route("/opds/cover_240_240/<book_id>")
-@app.route("/opds/cover_90_90/<book_id>")
-@app.route("/opds/cover/<book_id>")
+@web.route("/opds/thumb_240_240/<book_id>")
+@web.route("/opds/cover_240_240/<book_id>")
+@web.route("/opds/cover_90_90/<book_id>")
+@web.route("/opds/cover/<book_id>")
 @requires_basic_auth_if_no_ano
 def feed_get_cover(book_id):
     book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
@@ -2152,41 +2071,41 @@ def render_read_books(page, are_read, as_xml=False):
                                 title=_(name, name=name), page="read")
 
 
-@app.route("/opds/readbooks/")
+@web.route("/opds/readbooks/")
 @login_required_if_no_ano
 def feed_read_books():
     off = request.args.get("offset") or 0
     return render_read_books(int(off) / (int(config.config_books_per_page)) + 1, True, True)
 
 
-@app.route("/readbooks/", defaults={'page': 1})
-@app.route("/readbooks/<int:page>'")
+@web.route("/readbooks/", defaults={'page': 1})
+@web.route("/readbooks/<int:page>'")
 @login_required_if_no_ano
 def read_books(page):
     return render_read_books(page, True)
 
 
-@app.route("/opds/unreadbooks/")
+@web.route("/opds/unreadbooks/")
 @login_required_if_no_ano
 def feed_unread_books():
     off = request.args.get("offset") or 0
     return render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True)
 
 
-@app.route("/unreadbooks/", defaults={'page': 1})
-@app.route("/unreadbooks/<int:page>'")
+@web.route("/unreadbooks/", defaults={'page': 1})
+@web.route("/unreadbooks/<int:page>'")
 @login_required_if_no_ano
 def unread_books(page):
     return render_read_books(page, False)
 
 
-@app.route("/read/<int:book_id>/<book_format>")
+@web.route("/read/<int:book_id>/<book_format>")
 @login_required_if_no_ano
 def read_book(book_id, book_format):
     book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
     if not book:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
     # check if book was downloaded before
     bookmark = None
@@ -2234,10 +2153,10 @@ def read_book(book_id, book_format):
                 return render_title_template('readcbr.html', comicfile=book_id, 
                 extension=fileext, title=_(u"Read a Book"), book=book)
         flash(_(u"Error opening eBook. File does not exist or file is not accessible."), category="error")
-        return redirect(url_for("index"))'''
+        return redirect(url_for("web.index"))'''
 
 
-@app.route("/download/<int:book_id>/<book_format>")
+@web.route("/download/<int:book_id>/<book_format>")
 @login_required_if_no_ano
 @download_required
 def get_download_link(book_id, book_format):
@@ -2265,14 +2184,14 @@ def get_download_link(book_id, book_format):
         abort(404)
 
 
-@app.route("/download/<int:book_id>/<book_format>/<anyname>")
+@web.route("/download/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
 @download_required
 def get_download_link_ext(book_id, book_format, anyname):
     return get_download_link(book_id, book_format)
 
 
-@app.route('/register', methods=['GET', 'POST'])
+@web.route('/register', methods=['GET', 'POST'])
 def register():
     if not config.config_public_reg:
         abort(404)
@@ -2321,10 +2240,10 @@ def register():
     return render_title_template('register.html', config=config, title=_(u"register"), page="register")
 
 
-@app.route('/login', methods=['GET', 'POST'])
+@web.route('/login', methods=['GET', 'POST'])
 def login():
     if not config.db_configured:
-        return redirect(url_for('basic_configuration'))
+        return redirect(url_for('web.basic_configuration'))
     if current_user is not None and current_user.is_authenticated:
         return redirect(url_for('index'))
     if request.method == "POST":
@@ -2344,7 +2263,7 @@ def login():
         elif user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest":
             login_user(user, remember=True)
             flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
-            return redirect_back(url_for("index"))
+            return redirect_back(url_for("web.index"))
         else:
             ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
             app.logger.info('Login failed for user "' + form['username'] + '" IP-adress: ' + ipAdress)
@@ -2352,21 +2271,21 @@ def login():
 
     # next_url = request.args.get('next')
     # if next_url is None or not is_safe_url(next_url):
-    next_url = url_for('index')
+    next_url = url_for('web.index')
 
     return render_title_template('login.html', title=_(u"login"), next_url=next_url, config=config, page="login")
 
 
-@app.route('/logout')
+@web.route('/logout')
 @login_required
 def logout():
     if current_user is not None and current_user.is_authenticated:
         logout_user()
-        logout_oauth_user()
-    return redirect(url_for('login'))
+        # logout_oauth_user()
+    return redirect(url_for('web.login'))
 
 
-@app.route('/remote/login')
+@web.route('/remote/login')
 @remote_login_required
 def remote_login():
     auth_token = ub.RemoteAuthToken()
@@ -2379,7 +2298,7 @@ def remote_login():
                                  verify_url=verify_url, page="remotelogin")
 
 
-@app.route('/verify/<token>')
+@web.route('/verify/<token>')
 @remote_login_required
 @login_required
 def verify_token(token):
@@ -2407,7 +2326,7 @@ def verify_token(token):
     return redirect(url_for('index'))
 
 
-@app.route('/ajax/verify_token', methods=['POST'])
+@web.route('/ajax/verify_token', methods=['POST'])
 @remote_login_required
 def token_verified():
     token = request.form['token']
@@ -2447,7 +2366,7 @@ def token_verified():
     return response
 
 
-@app.route('/send/<int:book_id>/<book_format>/<int:convert>')
+@web.route('/send/<int:book_id>/<book_format>/<int:convert>')
 @login_required
 @download_required
 def send_to_kindle(book_id, book_format, convert):
@@ -2468,7 +2387,7 @@ def send_to_kindle(book_id, book_format, convert):
     return redirect(request.environ["HTTP_REFERER"])
 
 
-@app.route("/shelf/add/<int:shelf_id>/<int:book_id>")
+@web.route("/shelf/add/<int:shelf_id>/<int:book_id>")
 @login_required
 def add_to_shelf(shelf_id, book_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -2521,7 +2440,7 @@ def add_to_shelf(shelf_id, book_id):
     return "", 204
 
 
-@app.route("/shelf/massadd/<int:shelf_id>")
+@web.route("/shelf/massadd/<int:shelf_id>")
 @login_required
 def search_to_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -2575,7 +2494,7 @@ def search_to_shelf(shelf_id):
     return redirect(url_for('index'))
 
 
-@app.route("/shelf/remove/<int:shelf_id>/<int:book_id>")
+@web.route("/shelf/remove/<int:shelf_id>/<int:book_id>")
 @login_required
 def remove_from_shelf(shelf_id, book_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -2621,7 +2540,7 @@ def remove_from_shelf(shelf_id, book_id):
 
 
 
-@app.route("/shelf/create", methods=["GET", "POST"])
+@web.route("/shelf/create", methods=["GET", "POST"])
 @login_required
 def create_shelf():
     shelf = ub.Shelf()
@@ -2648,7 +2567,7 @@ def create_shelf():
         return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
 
 
-@app.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
+@web.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def edit_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -2676,7 +2595,7 @@ def edit_shelf(shelf_id):
         return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Edit a shelf"), page="shelfedit")
 
 
-@app.route("/shelf/delete/<int:shelf_id>")
+@web.route("/shelf/delete/<int:shelf_id>")
 @login_required
 def delete_shelf(shelf_id):
     cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -2698,7 +2617,7 @@ def delete_shelf(shelf_id):
     return redirect(url_for('index'))
 
 
-@app.route("/shelf/<int:shelf_id>")
+@web.route("/shelf/<int:shelf_id>")
 @login_required_if_no_ano
 def show_shelf(shelf_id):
     if current_user.is_anonymous:
@@ -2725,10 +2644,10 @@ def show_shelf(shelf_id):
                                  shelf=shelf, page="shelf")
     else:
         flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
 
-@app.route("/shelfdown/<int:shelf_id>")
+@web.route("/shelfdown/<int:shelf_id>")
 def show_shelf_down(shelf_id):
     if current_user.is_anonymous:
         shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == shelf_id).first()
@@ -2754,9 +2673,9 @@ def show_shelf_down(shelf_id):
                                  shelf=shelf, page="shelf")
     else:
         flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
-@app.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
+@web.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def order_shelf(shelf_id):
     if request.method == "POST":
@@ -2787,14 +2706,14 @@ def order_shelf(shelf_id):
                                  shelf=shelf, page="shelforder")
 
 
-@app.route("/me", methods=["GET", "POST"])
+@web.route("/me", methods=["GET", "POST"])
 @login_required
 def profile():
     content = ub.session.query(ub.User).filter(ub.User.id == int(current_user.id)).first()
     downloads = list()
     languages = speaking_language()
     translations = babel.list_translations() + [LC('en')]
-    oauth_status = get_oauth_status()
+    oauth_status = None # oauth_status = get_oauth_status()
     for book in content.downloads:
         downloadBook = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
         if downloadBook:
@@ -2864,7 +2783,7 @@ def profile():
                                 name=current_user.nickname), page="me", registered_oauth=oauth_check, oauth_status=oauth_status)
 
 
-@app.route("/admin/view")
+@web.route("/admin/view")
 @login_required
 @admin_required
 def admin():
@@ -2892,14 +2811,14 @@ def admin():
                                  title=_(u"Admin page"), page="admin")
 
 
-@app.route("/admin/config", methods=["GET", "POST"])
+@web.route("/admin/config", methods=["GET", "POST"])
 @login_required
 @admin_required
 def configuration():
     return configuration_helper(0)
 
 
-@app.route("/admin/viewconfig", methods=["GET", "POST"])
+@web.route("/admin/viewconfig", methods=["GET", "POST"])
 @login_required
 @admin_required
 def view_configuration():
@@ -2989,7 +2908,7 @@ def view_configuration():
 
 
 
-@app.route("/config", methods=["GET", "POST"])
+@web.route("/config", methods=["GET", "POST"])
 @unconfigured
 def basic_configuration():
     logout_user()
@@ -3225,7 +3144,7 @@ def configuration_helper(origin):
                                  goodreads=goodreads_support, title=_(u"Basic Configuration"), page="config")
 
 
-@app.route("/admin/user/new", methods=["GET", "POST"])
+@web.route("/admin/user/new", methods=["GET", "POST"])
 @login_required
 @admin_required
 def new_user():
@@ -3307,7 +3226,7 @@ def new_user():
                                  languages=languages, title=_(u"Add new user"), page="newuser")
 
 
-@app.route("/admin/mailsettings", methods=["GET", "POST"])
+@web.route("/admin/mailsettings", methods=["GET", "POST"])
 @login_required
 @admin_required
 def edit_mailsettings():
@@ -3340,7 +3259,7 @@ def edit_mailsettings():
                                  page="mailset")
 
 
-@app.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
+@web.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
 @login_required
 @admin_required
 def edit_user(user_id):
@@ -3483,7 +3402,7 @@ def edit_user(user_id):
                                 nick=content.nickname), page="edituser")
 
 
-@app.route("/admin/resetpassword/<int:user_id>")
+@web.route("/admin/resetpassword/<int:user_id>")
 @login_required
 @admin_required
 def reset_password(user_id):
@@ -3511,7 +3430,7 @@ def render_edit_book(book_id):
 
     if not book:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
     for indx in range(0, len(book.languages)):
         book.languages[indx].language_name = language_table[get_locale()][book.languages[indx].lang_code]
@@ -3701,7 +3620,7 @@ def upload_cover(request, book):
                 flash(_(u"Cover-file is not a valid image file" % saved_filename), category="error")
                 return redirect(url_for('show_book', book_id=book.id))
 
-@app.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
+@web.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
@@ -3717,7 +3636,7 @@ def edit_book(book_id):
     # Book not found
     if not book:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
-        return redirect(url_for("index"))
+        return redirect(url_for("web.index"))
 
     upload_single_file(request, book, book_id)
     upload_cover(request, book)
@@ -3861,7 +3780,7 @@ def edit_book(book_id):
         return redirect(url_for('show_book', book_id=book.id))
 
 
-@app.route("/upload", methods=["GET", "POST"])
+@web.route("/upload", methods=["GET", "POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
@@ -4018,10 +3937,10 @@ def upload():
                 return render_title_template('detail.html', entry=book, cc=cc,
                                              title=book.title, books_shelfs=book_in_shelfs, kindle_list=kindle_list,
                                              reader_list=reader_list, page="upload")
-    return redirect(url_for("index"))
+    return redirect(url_for("web.index"))
 
 
-@app.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@web.route("/admin/book/convert/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def convert_bookformat(book_id):
@@ -4047,7 +3966,7 @@ def convert_bookformat(book_id):
         flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
     return redirect(request.environ["HTTP_REFERER"])
 
-
+'''
 def register_oauth_blueprint(blueprint, show_name):
     if blueprint.name != "":
         oauth_check[blueprint.name] = show_name
@@ -4260,7 +4179,7 @@ def github_error(blueprint, error, error_description=None, error_uri=None):
     flash(msg, category="error")
 
 
-@app.route('/github')
+@web.route('/github')
 @github_oauth_required
 def github_login():
     if not github.authorized:
@@ -4273,13 +4192,13 @@ def github_login():
     return redirect(url_for('login'))
 
 
-@app.route('/unlink/github', methods=["GET"])
+@web.route('/unlink/github', methods=["GET"])
 @login_required
 def github_login_unlink():
     return unlink_oauth(github_blueprint.name)
 
 
-@app.route('/google')
+@web.route('/google')
 @google_oauth_required
 def google_login():
     if not google.authorized:
@@ -4306,7 +4225,8 @@ def google_error(blueprint, error, error_description=None, error_uri=None):
     flash(msg, category="error")
 
 
-@app.route('/unlink/google', methods=["GET"])
+@web.route('/unlink/google', methods=["GET"])
 @login_required
 def google_login_unlink():
     return unlink_oauth(google_blueprint.name)
+'''
diff --git a/cps/worker.py b/cps/worker.py
index 80222f21..c0c68833 100644
--- a/cps/worker.py
+++ b/cps/worker.py
@@ -27,11 +27,11 @@ import socket
 import sys
 import os
 from email.generator import Generator
-import web
+from cps import config, db # , app
+# import web
 from flask_babel import gettext as _
 import re
-import gdriveutils as gd
-# import subprocess
+# import gdriveutils as gd
 from subproc_wrapper import process_open
 
 
@@ -70,8 +70,8 @@ RET_SUCCESS = 1
 # it in MIME Base64 encoded to
 def get_attachment(bookpath, filename):
     """Get file as MIMEBase message"""
-    calibrepath = web.config.config_calibre_dir
-    if web.ub.config.config_use_google_drive:
+    calibrepath = config.config_calibre_dir
+    if config.config_use_google_drive:
         df = gd.getFileFromEbooksFolder(bookpath, filename)
         if df:
             datafile = os.path.join(calibrepath, bookpath, filename)
@@ -90,8 +90,8 @@ def get_attachment(bookpath, filename):
             data = file_.read()
             file_.close()
         except IOError as e:
-            web.app.logger.exception(e) # traceback.print_exc()
-            web.app.logger.error(u'The requested file could not be read. Maybe wrong permissions?')
+            # web.app.logger.exception(e) # traceback.print_exc()
+            # web.app.logger.error(u'The requested file could not be read. Maybe wrong permissions?')
             return None
 
     attachment = MIMEBase('application', 'octet-stream')
@@ -235,7 +235,7 @@ class WorkerThread(threading.Thread):
         curr_task = self.queue[self.current]['taskType']
         filename = self._convert_ebook_format()
         if filename:
-            if web.ub.config.config_use_google_drive:
+            if config.config_use_google_drive:
                 gd.updateGdriveCalibreFromLocal()
             if curr_task == TASK_CONVERT:
                 self.add_email(self.queue[self.current]['settings']['subject'], self.queue[self.current]['path'],
@@ -254,8 +254,8 @@ class WorkerThread(threading.Thread):
         # if it does - mark the conversion task as complete and return a success
         # this will allow send to kindle workflow to continue to work
         if os.path.isfile(file_path + format_new_ext):
-            web.app.logger.info("Book id %d already converted to %s", bookid, format_new_ext)
-            cur_book = web.db.session.query(web.db.Books).filter(web.db.Books.id == bookid).first()
+            # web.app.logger.info("Book id %d already converted to %s", bookid, format_new_ext)
+            cur_book = db.session.query(db.Books).filter(db.Books.id == bookid).first()
             self.queue[self.current]['path'] = file_path
             self.queue[self.current]['title'] = cur_book.title
             self._handleSuccess()
@@ -264,23 +264,23 @@ class WorkerThread(threading.Thread):
             web.app.logger.info("Book id %d - target format of %s does not exist. Moving forward with convert.", bookid, format_new_ext)
 
         # check if converter-executable is existing
-        if not os.path.exists(web.ub.config.config_converterpath):
+        if not os.path.exists(config.config_converterpath):
             # ToDo Text is not translated
-            self._handleError(u"Convertertool %s not found" % web.ub.config.config_converterpath)
+            self._handleError(u"Convertertool %s not found" % config.config_converterpath)
             return
 
         try:
             # check which converter to use kindlegen is "1"
             if format_old_ext == '.epub' and format_new_ext == '.mobi':
-                if web.ub.config.config_ebookconverter == 1:
+                if config.config_ebookconverter == 1:
                     '''if os.name == 'nt':
                         command = web.ub.config.config_converterpath + u' "' + file_path + u'.epub"'
                         if sys.version_info < (3, 0):
                             command = command.encode(sys.getfilesystemencoding())
                     else:'''
-                    command = [web.ub.config.config_converterpath, file_path + u'.epub']
+                    command = [config.config_converterpath, file_path + u'.epub']
                     quotes = (1)
-            if web.ub.config.config_ebookconverter == 2:
+            if config.config_ebookconverter == 2:
                 # Linux py2.7 encode as list without quotes no empty element for parameters
                 # linux py3.x no encode and as list without quotes no empty element for parameters
                 # windows py2.7 encode as string with quotes empty element for parameters is okay
@@ -293,11 +293,11 @@ class WorkerThread(threading.Thread):
                     if sys.version_info < (3, 0):
                         command = command.encode(sys.getfilesystemencoding())
                 else:'''
-                command = [web.ub.config.config_converterpath, (file_path + format_old_ext),
+                command = [config.config_converterpath, (file_path + format_old_ext),
                     (file_path + format_new_ext)]
                 index = 3
-                if web.ub.config.config_calibre:
-                    parameters = web.ub.config.config_calibre.split(" ")
+                if config.config_calibre:
+                    parameters = config.config_calibre.split(" ")
                     for param in parameters:
                         command.append(param)
                         quotes.append(index)
@@ -308,7 +308,7 @@ class WorkerThread(threading.Thread):
             self._handleError(_(u"Ebook-converter failed: %(error)s", error=e))
             return
 
-        if web.ub.config.config_ebookconverter == 1:
+        if config.config_ebookconverter == 1:
             nextline = p.communicate()[0]
             # Format of error message (kindlegen translates its output texts):
             # Error(prcgen):E23006: Language not recognized in metadata.The dc:Language field is mandatory.Aborting.
@@ -336,24 +336,24 @@ class WorkerThread(threading.Thread):
         # 0 = Info(prcgen):I1036: Mobi file built successfully
         # 1 = Info(prcgen):I1037: Mobi file built with WARNINGS!
         # 2 = Info(prcgen):I1038: MOBI file could not be generated because of errors!
-        if (check < 2 and web.ub.config.config_ebookconverter == 1) or \
-            (check == 0 and web.ub.config.config_ebookconverter == 2):
-            cur_book = web.db.session.query(web.db.Books).filter(web.db.Books.id == bookid).first()
+        if (check < 2 and config.config_ebookconverter == 1) or \
+            (check == 0 and config.config_ebookconverter == 2):
+            cur_book = db.session.query(db.Books).filter(db.Books.id == bookid).first()
             if os.path.isfile(file_path + format_new_ext):
-                new_format = web.db.Data(name=cur_book.data[0].name,
+                new_format = db.Data(name=cur_book.data[0].name,
                                          book_format=self.queue[self.current]['settings']['new_book_format'].upper(),
                                          book=bookid, uncompressed_size=os.path.getsize(file_path + format_new_ext))
                 cur_book.data.append(new_format)
-                web.db.session.commit()
+                db.session.commit()
                 self.queue[self.current]['path'] = cur_book.path
                 self.queue[self.current]['title'] = cur_book.title
-                if web.ub.config.config_use_google_drive:
+                if config.config_use_google_drive:
                     os.remove(file_path + format_old_ext)
                 self._handleSuccess()
                 return file_path + format_new_ext
             else:
                 error_message = format_new_ext.upper() + ' format not found on disk'
-        web.app.logger.info("ebook converter failed with error while converting book")
+        # web.app.logger.info("ebook converter failed with error while converting book")
         if not error_message:
             error_message = 'Ebook converter failed with unknown error'
         self._handleError(error_message)