diff --git a/README.md b/README.md
index 67766f3..3767a79 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
 # Run
 ```bash
-uwsgi --plugin /usr/lib/uwsgi/python_plugin.so --http :1180 -w md2html.uwsgi --http-keepalive --http-auto-chunked
+uwsgi --need-plugin /usr/lib/uwsgi/python_plugin.so \
+      --need-plugin /usr/lib/uwsgi/gevent_plugin.so \
+      -H venv \
+      --http :1180 \ 
+      -w md2html.uwsgi_handler \ 
+      --http-keepalive \
+      --http-auto-chunked \ 
+      --gevent 10
 ```
diff --git a/build_docker_image.sh b/build_docker_image.sh
index 800d34e..3dffe39 100755
--- a/build_docker_image.sh
+++ b/build_docker_image.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 set -e
 
-python3 setup.py bdist_wheel
-cp docker/Dockerfile dist/Dockerfile
-docker build dist --tag alpine:md2html
+venv/bin/python -m build
+mkdir -p docker/build
+cp dist/md2html-*.whl docker/build/
+cp docker/Dockerfile docker/build/Dockerfile
+cp docker/uwsgi.ini docker/build/uwsgi.ini
+
+docker build docker/build --tag alpine:md2html
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3d123d5..3966a7f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,15 +1,20 @@
 FROM alpine:latest
 MAINTAINER Oggioni Walter <oggioni.walter@gmail.com>
 RUN apk update
-RUN apk add python3 py3-pip py3-watchdog uwsgi uwsgi-python3 graphviz
+RUN apk add python3 py3-pip uwsgi uwsgi-python3 graphviz uwsgi-gevent3
 RUN mkdir /srv/http
+RUN mkdir /var/md2html
+WORKDIR /var/md2html
+RUN python -m venv venv
+ADD uwsgi.ini /var/md2html
+ADD md2html-*.whl /
+RUN venv/bin/pip install /md2html-*.whl && rm /md2html-*.whl
 VOLUME /srv/http
 WORKDIR /srv/http
-ADD md2html-*.whl /
-RUN pip3 install /md2html-*.whl && rm /md2html-*.whl
 ENTRYPOINT ["uwsgi"]
-EXPOSE 1180/tcp
-EXPOSE 1180/udp
+EXPOSE 1910/tcp
+EXPOSE 1910/udp
 USER nobody
-CMD ["--plugin", "/usr/lib/uwsgi/python_plugin.so", "-s", ":1180", "-w", "md2html.uwsgi"]
+CMD [ "--ini", "/var/md2html/uwsgi.ini" ]
+
 
diff --git a/docker/uwsgi.ini b/docker/uwsgi.ini
new file mode 100644
index 0000000..a2f270f
--- /dev/null
+++ b/docker/uwsgi.ini
@@ -0,0 +1,8 @@
+[uwsgi]
+#logformat = "%(proto) - %(method) %(uri) %(status) %(addr)
+need-plugin=/usr/lib/uwsgi/python_plugin.so
+need-plugin=/usr/lib/uwsgi/gevent3_plugin.so
+socket = :1910
+module = md2html.uwsgi_handler
+virtualenv = /var/md2html/venv
+gevent = 1000
\ No newline at end of file
diff --git a/md2html/md2html.py b/md2html/md2html.py
deleted file mode 100644
index f75f010..0000000
--- a/md2html/md2html.py
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import hashlib
-import sys
-import threading
-from http.server import BaseHTTPRequestHandler, socketserver, HTTPServer
-from os.path import basename, dirname, abspath, join
-from urllib.parse import urlparse
-
-import markdown
-
-STATIC_CACHE = {}
-
-
-def load_from_cache(path):
-    global STATIC_CACHE
-    if path not in STATIC_CACHE:
-        with open(join(dirname(__file__), 'static') + path, 'r') as static_file:
-            STATIC_CACHE[path] = static_file.read()
-    return STATIC_CACHE[path]
-
-
-def compile_html(mdfile=None, extensions=None, raw=None, **kwargs):
-    html = None
-    with mdfile and open(mdfile, 'r') or sys.stdin as instream:
-        html = markdown.markdown(instream.read(), extensions=extensions, output_format='html5')
-    if raw:
-        doc = html
-    else:
-        css = '        <style>%s\n%s\n        </style>' % (
-            load_from_cache('/github-markdown.css'),
-            load_from_cache('/custom.css')
-        )
-        doc = load_from_cache('/template.html').format(content=html, script='', css=css)
-    return doc
-
-
-class ThreadingHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
-    pass
-
-
-class MarkdownHTTPServer(ThreadingHTTPServer):
-
-    def __init__(self, mdfile, extensions=(), handler=BaseHTTPRequestHandler, interface="127.0.0.1", port=8080):
-        from watchdog.observers import Observer
-        from watchdog.events import PatternMatchingEventHandler
-        import signal
-
-        self.stop = False
-
-        def sigint_handler(signum, frame):
-            self.stop = True
-
-        handlers = (sigint_handler, signal.getsignal(signal.SIGINT))
-        signal.signal(signal.SIGINT, lambda signum, frame: [handler(signum, frame) for handler in handlers])
-
-        self.mdfile = mdfile
-        self.extensions = extensions
-        self.condition_variable = threading.Condition()
-        self.hash = None
-        self.etag = None
-
-        event_handler = PatternMatchingEventHandler(
-            patterns=[mdfile],
-            ignore_patterns=None,
-            ignore_directories=True,
-            case_sensitive=True)
-
-        def on_modified(evt):
-            self.condition_variable.acquire()
-            if self.update_file_digest():
-                self.condition_variable.notify_all()
-            self.condition_variable.release()
-
-        event_handler.on_modified = on_modified
-
-        self.observer = Observer()
-        self.observer.schedule(event_handler, path=dirname(abspath(self.mdfile)), recursive=False)
-        self.observer.start()
-        super().__init__((interface, port), handler)
-
-    def update_file_digest(self):
-        md5 = hashlib.md5()
-        with open(self.mdfile, 'rb') as mdfile:
-            md5.update(mdfile.read())
-        digest = md5.digest()
-        if not self.hash or self.hash != digest:
-            self.hash = digest
-            self.etag = md5.hexdigest()
-            return True
-        else:
-            return False
-
-
-class MarkdownRequestHandler(BaseHTTPRequestHandler):
-    status_map = {
-        200: "OK",
-        204: "No Content",
-        304: "Not Modified",
-        400: "Bad Request",
-        401: "Unauthorized",
-        404: "Not Found",
-        499: "Service Error",
-        500: "Internal Server Error",
-        501: "Not Implemented",
-        503: "Service Unavailable"
-    }
-
-    def answer(self, code, reply=None, content_type="text/plain",
-               headers=()):
-        output = self.wfile
-        if not reply:
-            reply = MarkdownRequestHandler.status_map[code]
-        try:
-            self.send_response(code, MarkdownRequestHandler.status_map[code])
-            for header in headers:
-                self.send_header(*header)
-            self.send_header("Content-Type", content_type)
-            self.send_header('Content-Length', len(reply))
-            self.end_headers()
-            output.write(reply.encode("UTF-8"))
-            output.flush()
-        except BrokenPipeError:
-            pass
-
-    def markdown_answer(self):
-        if not self.server.etag:
-            self.server.condition_variable.acquire()
-            self.server.update_file_digest()
-            self.server.condition_variable.release()
-        self.answer(200, headers=(('Etag', self.server.etag),),
-                    reply=compile_html(mdfile=self.server.mdfile, extensions=self.server.extensions, raw=True),
-                    content_type='text/html')
-
-    def do_GET(self):
-        path = urlparse(self.path)
-        if path.path == '/':
-            self.answer(200, reply=load_from_cache('/template.html').format(
-                content='',
-                script='<script src="/hot-reload.js", type="text/javascript"></script>',
-                css='<link rel="stylesheet" href="github-markdown.css">'
-                    '<link rel="stylesheet" href="custom.css">'),
-                        content_type='text/html')
-        elif path.path in {'/github-markdown.css', '/custom.css', '/hot-reload.js'}:
-            self.answer(200, load_from_cache(path.path), content_type='text/css')
-        elif path.path == '/markdown':
-            self.markdown_answer()
-        elif path.path == '/reload':
-            if 'If-None-Match' not in self.headers or self.headers['If-None-Match'] != self.server.etag:
-                self.markdown_answer()
-            else:
-                self.server.condition_variable.acquire()
-                self.server.condition_variable.wait(timeout=10)
-                self.server.condition_variable.release()
-                if self.server.stop:
-                    self.answer(503)
-                elif self.headers['If-None-Match'] == self.server.etag:
-                    self.answer(304)
-                else:
-                    self.answer(200, headers=(('Etag', self.server.etag),),
-                                reply=compile_html(mdfile=self.server.mdfile,
-                                                   extensions=self.server.extensions,
-                                                   raw=True),
-                                content_type='text/html')
-        else:
-            self.answer(404)
-
-
-def parse_args(args=None):
-    parser = argparse.ArgumentParser(description='Make a complete, styled HTML document from a Markdown file.')
-    parser.add_argument('mdfile', help='File to convert. Defaults to stdin.')
-    parser.add_argument('-o', '--out', help='Output file name. Defaults to stdout.')
-    parser.add_argument('-r', '--raw', action='store_true',
-                        help='Just output a raw html fragment, as returned from the markdown module')
-    parser.add_argument('-e', '--extensions', nargs='+', default=['extra', 'smarty', 'tables'],
-                        help='Activate specified markdown extensions (defaults to "extra smarty tables")')
-
-    try:
-        import watchdog
-        import signal
-        parser.add_argument('-w', '--watch', action='store_true',
-                            help='Watch specified source file and rerun the compilation for every time it changes')
-        parser.add_argument('-p', '--port', default=5000, type=int,
-                            help='Specify http server port (defaults to 5000)')
-        parser.add_argument('-i', '--interface', default='',
-                            help='Specify http server listen interface (defaults to localhost)')
-    except ImportError:
-        pass
-    return parser.parse_args(args)
-
-
-def write_html(out=None, **kwargs):
-    doc = compile_html(**kwargs)
-    with (out and open(out, 'w')) or sys.stdout as outstream:
-        outstream.write(doc)
-
-
-def main(args=None):
-    args = parse_args(args)
-    if hasattr(args, 'watch') and args.watch:
-        server = MarkdownHTTPServer(args.mdfile,
-                                    extensions=args.extensions,
-                                    interface=args.interface,
-                                    port=args.port,
-                                    handler=MarkdownRequestHandler)
-        server.serve_forever()
-    else:
-        write_html(**vars(args))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/md2html/uwsgi.py b/md2html/uwsgi.py
deleted file mode 100644
index a1b1ade..0000000
--- a/md2html/uwsgi.py
+++ /dev/null
@@ -1,138 +0,0 @@
-import logging
-from os import getcwd, listdir
-from os.path import exists, splitext, isfile, join, relpath, isdir, basename, getmtime, dirname
-from mimetypes import init as mimeinit, guess_type
-import hashlib
-from .md2html import compile_html
-from shutil import which
-from subprocess import Popen, PIPE, check_output
-
-mimeinit()
-log = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
-
-cwd = getcwd()
-
-
-def has_extension(filepath, extension):
-    _, ext = splitext(filepath)
-    return ext == extension
-
-
-def is_markdown(filepath):
-    return has_extension(filepath, ".md")
-
-
-def is_dotfile(filepath):
-    return has_extension(filepath, ".dot")
-
-
-cache = dict()
-
-
-def file_hash(filepath, bufsize=4096):
-    if bufsize <= 0:
-        raise ValueError("Buffer size must be greater than 0")
-    md5 = hashlib.md5()
-    with open(filepath, 'rb') as f:
-        while True:
-            buf = f.read(bufsize)
-            if len(buf) == 0:
-                break
-            md5.update(buf)
-    return md5.digest()
-
-
-def application(env, start_response):
-    path = join(cwd, relpath(env['PATH_INFO'], '/'))
-
-    if exists(path):
-        if isfile(path):
-            cache_result = cache.get(path)
-            _mtime = None
-
-            def mtime():
-                nonlocal _mtime
-                if not _mtime:
-                    _mtime = getmtime(path)
-                return _mtime
-
-            if not cache_result or cache_result[1] < mtime():
-                digest = file_hash(path).hex()
-                cache[path] = digest, mtime()
-            else:
-                digest = cache_result[0]
-
-            def parse_etag(etag):
-                if etag is None:
-                    return
-                start = etag.find('"')
-                if start < 0:
-                    return
-                end = etag.find('"', start + 1)
-                return etag[start + 1: end]
-
-            etag = parse_etag(env.get('HTTP_IF_NONE_MATCH'))
-            if etag and etag == digest:
-                start_response('304 Not Modified', [
-                    ('Etag', '"%s"' % digest),
-                    ('Cache-Control', 'no-cache, must-revalidate, max-age=86400'),
-                ])
-                return []
-            elif is_markdown(path):
-                body = compile_html(path, ['extra', 'smarty', 'tables']).encode()
-                start_response('200 OK', [('Content-Type', 'text/html; charset=UTF-8'),
-                                          ('Etag', '"%s"' % digest),
-                                          ('Cache-Control', 'no-cache, must-revalidate, max-age=86400'),
-                                          ])
-                return [body]
-            elif is_dotfile(path) and which("dot"):
-                body = check_output(['dot', '-Tsvg', basename(path)], cwd=dirname(path))
-                start_response('200 OK', [('Content-Type', 'image/svg+xml; charset=UTF-8'),
-                                          ('Etag', '"%s"' % digest),
-                                          ('Cache-Control', 'no-cache, must-revalidate, max-age=86400'),
-                                          ])
-                return [body]
-            else:
-                def read_file(file_path):
-                    buffer_size = 1024
-                    with open(file_path, 'rb') as f:
-                        while True:
-                            result = f.read(buffer_size)
-                            if len(result) == 0:
-                                break
-                            yield result
-
-                start_response('200 OK', [('Content-Type', guess_type(basename(path))[0] or 'application/octet-stream'),
-                                          ('Etag', '"%s"' % digest),
-                                          ('Cache-Control', 'no-cache, must-revalidate, max-age=86400'),
-                                          ])
-                return read_file(path)
-        elif isdir(path):
-            body = directory_listing(env['PATH_INFO'], path).encode()
-            start_response('200 OK', [
-                ('Content-Type', 'text/html; charset=UTF-8'),
-            ])
-            return [body]
-    start_response('404 NOT_FOUND', [])
-    return []
-
-
-def directory_listing(path_info, path):
-    title = "Directory listing for %s" % path_info
-    result = "<!DOCTYPE html><html><head>"
-    result += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"
-    result += "<title>" + title + "</title></head>"
-    result += "<body><h1>" + title + "</h1><hr>"
-    result += "<ul>"
-    if path_info != '/':
-        result += "<li><a href=\"../\"/>../</li>"
-
-    def ls(filter):
-        return (entry for entry in sorted(listdir(path)) if filter(join(path, entry)))
-
-    for entry in ls(isdir):
-        result += '<li><a href="' + entry + '/' + '"/>' + entry + '/' + '</li>'
-    for entry in ls(lambda entry: isfile(entry) and is_markdown(entry)):
-        result += '<li><a href="' + entry + '"/>' + entry + '</li>'
-    return result
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..dbdabe1
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,49 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "md2html"
+version = "0.3"
+authors = [
+  { name="Walter Oggioni", email="oggioni.walter@gmail.com" },
+]
+description = "Markdown to HTML renderer"
+readme = "README.md"
+requires-python = ">=3.10"
+classifiers = [
+        'Development Status :: 3 - Alpha',
+        'Topic :: Utilities',
+        'License :: OSI Approved :: MIT License',
+        'Intended Audience :: System Administrators',
+        'Intended Audience :: Developers',
+        'Environment :: Console',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3',
+]
+dependencies = [
+    "gevent",
+    "greenlet",
+    "Markdown",
+    "Pygments",
+    "watchdog",
+    "zope.event",
+    "zope.interface"
+]
+
+[tool.setuptools.package-data]
+md2html = ['static/*.html', 'static/*.css', 'static/*.js']
+
+[project.urls]
+"Homepage" = "https://github.com/woggioni/md2html"
+"Bug Tracker" = "https://github.com/woggioni/md2html/issues"
+
+[tool.mypy]
+python_version = "3.10"
+disallow_untyped_defs = true
+show_error_codes = true
+no_implicit_optional = true
+warn_return_any = true
+warn_unused_ignores = true
+exclude = ["scripts", "docs", "test"]
+strict = true
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..5ed8b40
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,8 @@
+gevent==23.9.1
+greenlet==3.0.0
+Markdown==3.5
+-e git+ssh://git@github.com/woggioni/md2html.git@67948f81c4cd118b26157c36e901ae8b17103624#egg=md2html
+Pygments==2.16.1
+watchdog==3.0.0
+zope.event==5.0
+zope.interface==6.1
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 48db67a..0000000
--- a/setup.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from os.path import join, dirname
-from setuptools import setup, find_packages
-
-
-def read(fname):
-    return open(join(dirname(__file__), fname)).read()
-
-
-config = {
-    'name': "md2html",
-    'version': "0.2",
-    'author': "Walter Oggioni",
-    'author_email': "oggioni.walter@gmail.com",
-    'description': ("Various development utility scripts"),
-    'long_description': '',
-    'license': "MIT",
-    'keywords': "build",
-    'url': "https://github.com/woggioni/md2html",
-    'packages': ['md2html'],
-    'package_data': {
-        'md2html': ['static/*.html', 'static/*.css', 'static/*.js'],
-    },
-    'include_package_data': True,
-    'classifiers': [
-        'Development Status :: 3 - Alpha',
-        'Topic :: Utilities',
-        'License :: OSI Approved :: MIT License',
-        'Intended Audience :: System Administrators',
-        'Intended Audience :: Developers',
-        'Environment :: Console',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-    ],
-    'install_requires': [
-      'markdown'
-    ],
-    "entry_points": {
-        'console_scripts': [
-            'md2html=md2html.md2html:main',
-        ],
-    }
-}
-setup(**config)
diff --git a/md2html/__init__.py b/src/md2html/__init__.py
similarity index 100%
rename from md2html/__init__.py
rename to src/md2html/__init__.py
diff --git a/src/md2html/file_watch.py b/src/md2html/file_watch.py
new file mode 100644
index 0000000..9d69292
--- /dev/null
+++ b/src/md2html/file_watch.py
@@ -0,0 +1,92 @@
+from threading import Lock
+from typing import Optional, Callable
+from os import getcwd
+from watchdog.events import PatternMatchingEventHandler, FileSystemEvent, \
+    FileCreatedEvent, FileModifiedEvent, FileClosedEvent, FileMovedEvent
+from watchdog.observers import Observer
+import logging
+from gevent.event import Event
+
+
+class Subscription:
+
+    def __init__(self, unsubscribe: Callable[['Subscription'], None]):
+        self._unsubscribe_callback = unsubscribe
+        self._event: Event = Event()
+
+    def unsubscribe(self) -> None:
+        self._unsubscribe_callback(self)
+
+    def wait(self, tout: float) -> bool:
+        return self._event.wait(tout)
+
+    def notify(self) -> None:
+        self._event.set()
+
+    def reset(self) -> None:
+        self._event.clear()
+
+
+class FileWatcher(PatternMatchingEventHandler):
+    def __init__(self, path):
+        super().__init__(patterns=['*.md'],
+                         ignore_patterns=None,
+                         ignore_directories=False,
+                         case_sensitive=True)
+        self.subscriptions: dict[str, set[Subscription]] = dict()
+        self.observer: Observer = Observer()
+        self.observer.schedule(self, path=path, recursive=True)
+        self.observer.start()
+        self.logger = logging.getLogger(FileWatcher.__name__)
+        self._lock = Lock()
+
+    def subscribe(self, path: str) -> Subscription:
+        subscriptions = self.subscriptions
+        subscriptions_per_path = subscriptions.setdefault(path, set())
+
+        def unsubscribe_callback(subscription):
+            with self._lock:
+                subscriptions_per_path.remove(subscription)
+
+        result = Subscription(unsubscribe_callback)
+        subscriptions_per_path.add(result)
+        return result
+
+    def stop(self) -> None:
+        self.observer.stop()
+        self.observer.join()
+
+    def on_any_event(self, event: FileSystemEvent) -> None:
+        what = "directory" if event.is_directory else "file"
+
+        def notify_subscriptions(path):
+            with self._lock:
+                subscriptions = self.subscriptions
+                subscriptions_per_path = subscriptions.get(path, None)
+                if subscriptions_per_path:
+                    for s in subscriptions_per_path:
+                        s.notify()
+
+        if isinstance(event, FileClosedEvent):
+            self.logger.debug("Closed %s: %s", what, event.src_path)
+            # update_subscriptions()
+        elif isinstance(event, FileMovedEvent):
+            self.logger.debug("Moved %s: %s to %s", what, event.src_path, event.dest_path)
+            notify_subscriptions(event.dest_path)
+        elif isinstance(event, FileCreatedEvent):
+            self.logger.debug("Created %s: %s", what, event.src_path)
+            notify_subscriptions(event.src_path)
+        elif isinstance(event, FileModifiedEvent):
+            self.logger.debug("Modified %s: %s", what, event.src_path)
+            notify_subscriptions(event.src_path)
+
+
+if __name__ == '__main__':
+
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format='%(asctime)s [%(threadName)s] (%(name)s) %(levelname)s %(message)s'
+    )
+    watcher = FileWatcher(getcwd())
+    watcher.observer.join()
+
diff --git a/src/md2html/md2html.py b/src/md2html/md2html.py
new file mode 100644
index 0000000..41b50fc
--- /dev/null
+++ b/src/md2html/md2html.py
@@ -0,0 +1,41 @@
+import sys
+from os.path import dirname, join
+from time import time
+from typing import Optional
+
+import markdown
+
+STATIC_RESOURCES: set[str] = {
+    '/github-markdown.css',
+    '/custom.css',
+    '/hot-reload.js',
+    '/pygment.css',
+}
+STATIC_CACHE: dict[str, tuple[str, float]] = {}
+
+MARDOWN_EXTENSIONS = ['extra', 'smarty', 'tables', 'codehilite']
+
+def load_from_cache(path) -> tuple[str, float]:
+    global STATIC_CACHE
+    if path not in STATIC_CACHE:
+        with open(join(dirname(__file__), 'static') + path, 'r') as static_file:
+            STATIC_CACHE[path] = (static_file.read(), time())
+    return STATIC_CACHE[path]
+
+
+def compile_html(mdfile=None,
+                 extensions: Optional[list[str]] = None,
+                 raw: bool = False) -> str:
+    with mdfile and open(mdfile, 'r') or sys.stdin as instream:
+        html = markdown.markdown(instream.read(), extensions=extensions, output_format='html')
+    if raw:
+        doc = html
+    else:
+        css = '        <style>% s\n%s\n%s\n        </style>' % (
+            load_from_cache('/github-markdown.css')[0],
+            load_from_cache('/pygment.css')[0],
+            load_from_cache('/custom.css')[0],
+        )
+        script = '<script src="/hot-reload.js", type="text/javascript" defer="true"></script>'
+        doc = load_from_cache('/template.html')[0].format(content=html, script=script, css=css)
+    return doc
diff --git a/src/md2html/server.py b/src/md2html/server.py
new file mode 100644
index 0000000..56ffdf7
--- /dev/null
+++ b/src/md2html/server.py
@@ -0,0 +1,225 @@
+import logging
+from os import getcwd, listdir
+from os.path import exists, splitext, isfile, join, relpath, isdir, basename, getmtime, dirname
+from mimetypes import init as mimeinit, guess_type
+import hashlib
+from .md2html import compile_html, load_from_cache, STATIC_RESOURCES, MARDOWN_EXTENSIONS
+from shutil import which
+from subprocess import check_output
+from io import BytesIO
+from typing import Callable, TYPE_CHECKING, BinaryIO, Optional
+from .file_watch import FileWatcher
+
+if TYPE_CHECKING:
+    from _typeshed import StrOrBytesPath
+
+mimeinit()
+
+cwd: 'StrOrBytesPath' = getcwd()
+
+
+def has_extension(filepath, extension):
+    _, ext = splitext(filepath)
+    return ext == extension
+
+
+def is_markdown(filepath):
+    return has_extension(filepath, ".md")
+
+
+def is_dotfile(filepath):
+    return has_extension(filepath, ".dot")
+
+
+class Server:
+
+    def __init__(self, root_dir: 'StrOrBytesPath' = getcwd()):
+        self.root_dir = root_dir
+        self.cache = dict['StrOrBytesPath', tuple[str, float]]()
+        self.file_watcher = FileWatcher(cwd)
+        self.logger = logging.getLogger(Server.__name__)
+
+    def handle_request(self, method: str, url_path: str, etag: Optional[str], query_string: Optional[str], start_response):
+        if method != 'GET':
+            start_response('405', [])
+            return []
+        path: 'StrOrBytesPath' = join(self.root_dir, relpath(url_path, '/'))
+        if url_path in STATIC_RESOURCES:
+            content, mtime = load_from_cache(url_path)
+            content = content.encode()
+            etag, digest = self.compute_etag_and_digest(
+                etag,
+                url_path,
+                lambda: BytesIO(content),
+                lambda: mtime
+            )
+            if etag and etag == digest:
+                return self.not_modified(start_response, digest, ('Cache-Control', 'must-revalidate, max-age=86400'))
+            elif content:
+                mime_type = guess_type(basename(url_path))[0] or 'application/octet-stream'
+                start_response('200 OK', [
+                    ('Content-Type', f'{mime_type}; charset=UTF-8'),
+                    ('Etag', 'W/"%s"' % digest),
+                    ('Cache-Control', 'must-revalidate, max-age=86400'),
+                ])
+                return content
+        elif exists(path):
+            if isfile(path):
+                etag, digest = self.compute_etag_and_digest(
+                    etag,
+                    path,
+                    lambda: open(path, 'rb'),
+                    lambda: getmtime(path)
+                )
+                if etag and etag == digest:
+                    if is_markdown(path) and query_string == 'reload':
+                        subscription = self.file_watcher.subscribe(path)
+                        try:
+                            has_changed = subscription.wait(30)
+                            if has_changed:
+                                _, digest = self.compute_etag_and_digest(
+                                    etag,
+                                    path,
+                                    lambda: open(path, 'rb'),
+                                    lambda: getmtime(path)
+                                )
+                                if etag != digest:
+                                    body = compile_html(path,
+                                                        MARDOWN_EXTENSIONS,
+                                                        raw=True).encode()
+                                    start_response('200 OK', [('Content-Type', 'text/html; charset=UTF-8'),
+                                                              ('Etag', 'W/"%s"' % digest),
+                                                              ('Cache-Control', 'no-cache'),
+                                                              ])
+                                    return [body]
+                        finally:
+                            subscription.unsubscribe()
+                    return self.not_modified(start_response, digest)
+                elif is_markdown(path):
+                    raw = query_string == 'reload'
+                    body = compile_html(path, MARDOWN_EXTENSIONS, raw=raw).encode()
+                    start_response('200 OK', [('Content-Type', 'text/html; charset=UTF-8'),
+                                              ('Etag', 'W/"%s"' % digest),
+                                              ('Cache-Control', 'no-cache'),
+                                              ])
+                    return [body]
+                elif is_dotfile(path) and which("dot"):
+                    body = check_output(['dot', '-Tsvg', basename(path)], cwd=dirname(path))
+                    start_response('200 OK', [('Content-Type', 'image/svg+xml; charset=UTF-8'),
+                                              ('Etag', 'W/"%s"' % digest),
+                                              ('Cache-Control', 'no-cache'),
+                                              ])
+                    return [body]
+                else:
+                    def read_file(file_path):
+                        buffer_size = 1024
+                        with open(file_path, 'rb') as f:
+                            while True:
+                                result = f.read(buffer_size)
+                                if len(result) == 0:
+                                    break
+                                yield result
+
+                    start_response('200 OK',
+                                   [('Content-Type', guess_type(basename(path))[0] or 'application/octet-stream'),
+                                    ('Etag', 'W/"%s"' % digest),
+                                    ('Cache-Control', 'no-cache'),
+                                    ])
+                    return read_file(path)
+            elif isdir(path):
+                body = self.directory_listing(url_path, path).encode()
+                start_response('200 OK', [
+                    ('Content-Type', 'text/html; charset=UTF-8'),
+                ])
+                return [body]
+        start_response('404 NOT_FOUND', [])
+        return []
+
+    @staticmethod
+    def stream_hash(source: BinaryIO, bufsize=0x1000) -> bytes:
+        if bufsize <= 0:
+            raise ValueError("Buffer size must be greater than 0")
+        md5 = hashlib.md5()
+        while True:
+            buf = source.read(bufsize)
+            if len(buf) == 0:
+                break
+            md5.update(buf)
+        return md5.digest()
+
+    @staticmethod
+    def file_hash(filepath, bufsize=0x1000) -> bytes:
+        if bufsize <= 0:
+            raise ValueError("Buffer size must be greater than 0")
+        md5 = hashlib.md5()
+        with open(filepath, 'rb') as f:
+            while True:
+                buf = f.read(bufsize)
+                if len(buf) == 0:
+                    break
+                md5.update(buf)
+        return md5.digest()
+
+    @staticmethod
+    def parse_etag(etag: str) -> Optional[str]:
+        if etag is None:
+            return
+        start = etag.find('"')
+        if start < 0:
+            return
+        end = etag.find('"', start + 1)
+        return etag[start + 1: end]
+
+    def compute_etag_and_digest(
+            self,
+            etag_header: str,
+            path: str,
+            stream_source: Callable[[], BinaryIO],
+            mtime_supplier: Callable[[], float]
+    ) -> tuple[str, str]:
+        cache_result = self.cache.get(path)
+        _mtime: Optional[float] = None
+
+        def mtime() -> float:
+            nonlocal _mtime
+            if not _mtime:
+                _mtime = mtime_supplier()
+            return _mtime
+
+        if not cache_result or cache_result[1] < mtime():
+            with stream_source() as stream:
+                digest = Server.stream_hash(stream).hex()
+            self.cache[path] = digest, mtime()
+        else:
+            digest = cache_result[0]
+
+        etag = Server.parse_etag(etag_header)
+        return etag, digest
+
+    @staticmethod
+    def not_modified(start_response, digest: str, cache_control=('Cache-Control', 'no-cache')) -> []:
+        start_response('304 Not Modified', [
+            ('Etag', f'W/"{digest}"'),
+            cache_control,
+        ])
+        return []
+
+    @staticmethod
+    def directory_listing(path_info, path) -> str:
+        title = "Directory listing for %s" % path_info
+        result = "<!DOCTYPE html><html><head>"
+        result += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"
+        result += "<title>" + title + "</title></head>"
+        result += "<body><h1>" + title + "</h1><hr>"
+        result += "<ul>"
+        if path_info != '/':
+            result += "<li><a href=\"../\"/>../</li>"
+
+        def ls(filter):
+            return (entry for entry in sorted(listdir(path)) if filter(join(path, entry)))
+
+        for entry in ls(isdir):
+            result += '<li><a href="' + entry + '/' + '"/>' + entry + '/' + '</li>'
+        for entry in ls(lambda entry: isfile(entry) and is_markdown(entry)):
+            result += '<li><a href="' + entry + '"/>' + entry + '</li>'
+        return result
diff --git a/md2html/static/custom.css b/src/md2html/static/custom.css
similarity index 100%
rename from md2html/static/custom.css
rename to src/md2html/static/custom.css
diff --git a/md2html/static/github-markdown.css b/src/md2html/static/github-markdown.css
similarity index 100%
rename from md2html/static/github-markdown.css
rename to src/md2html/static/github-markdown.css
diff --git a/md2html/static/hot-reload.js b/src/md2html/static/hot-reload.js
similarity index 89%
rename from md2html/static/hot-reload.js
rename to src/md2html/static/hot-reload.js
index 1aaae48..5d219f6 100644
--- a/md2html/static/hot-reload.js
+++ b/src/md2html/static/hot-reload.js
@@ -13,7 +13,7 @@ function req(first) {
         console.log(xmlhttp.status, xmlhttp.statusText);
         setTimeout(req, 1000, false);
     };
-    xmlhttp.open("GET", first ? "/markdown" : "/reload", true);
+    xmlhttp.open("GET", location.pathname + "?reload", true);
     xmlhttp.send();
 }
 req(true);
diff --git a/src/md2html/static/pygment.css b/src/md2html/static/pygment.css
new file mode 100644
index 0000000..c4b2fd9
--- /dev/null
+++ b/src/md2html/static/pygment.css
@@ -0,0 +1,75 @@
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+.codehilite .hll { background-color: #ffffcc }
+.codehilite { background: #f8f8f8; }
+.codehilite .c { color: #3D7B7B; font-style: italic } /* Comment */
+.codehilite .err { border: 1px solid #FF0000 } /* Error */
+.codehilite .k { color: #008000; font-weight: bold } /* Keyword */
+.codehilite .o { color: #666666 } /* Operator */
+.codehilite .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
+.codehilite .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
+.codehilite .cp { color: #9C6500 } /* Comment.Preproc */
+.codehilite .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
+.codehilite .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
+.codehilite .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
+.codehilite .gd { color: #A00000 } /* Generic.Deleted */
+.codehilite .ge { font-style: italic } /* Generic.Emph */
+.codehilite .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
+.codehilite .gr { color: #E40000 } /* Generic.Error */
+.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.codehilite .gi { color: #008400 } /* Generic.Inserted */
+.codehilite .go { color: #717171 } /* Generic.Output */
+.codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.codehilite .gs { font-weight: bold } /* Generic.Strong */
+.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.codehilite .gt { color: #0044DD } /* Generic.Traceback */
+.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.codehilite .kp { color: #008000 } /* Keyword.Pseudo */
+.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.codehilite .kt { color: #B00040 } /* Keyword.Type */
+.codehilite .m { color: #666666 } /* Literal.Number */
+.codehilite .s { color: #BA2121 } /* Literal.String */
+.codehilite .na { color: #687822 } /* Name.Attribute */
+.codehilite .nb { color: #008000 } /* Name.Builtin */
+.codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.codehilite .no { color: #880000 } /* Name.Constant */
+.codehilite .nd { color: #AA22FF } /* Name.Decorator */
+.codehilite .ni { color: #717171; font-weight: bold } /* Name.Entity */
+.codehilite .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
+.codehilite .nf { color: #0000FF } /* Name.Function */
+.codehilite .nl { color: #767600 } /* Name.Label */
+.codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.codehilite .nv { color: #19177C } /* Name.Variable */
+.codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
+.codehilite .mb { color: #666666 } /* Literal.Number.Bin */
+.codehilite .mf { color: #666666 } /* Literal.Number.Float */
+.codehilite .mh { color: #666666 } /* Literal.Number.Hex */
+.codehilite .mi { color: #666666 } /* Literal.Number.Integer */
+.codehilite .mo { color: #666666 } /* Literal.Number.Oct */
+.codehilite .sa { color: #BA2121 } /* Literal.String.Affix */
+.codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
+.codehilite .sc { color: #BA2121 } /* Literal.String.Char */
+.codehilite .dl { color: #BA2121 } /* Literal.String.Delimiter */
+.codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
+.codehilite .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
+.codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
+.codehilite .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
+.codehilite .sx { color: #008000 } /* Literal.String.Other */
+.codehilite .sr { color: #A45A77 } /* Literal.String.Regex */
+.codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
+.codehilite .ss { color: #19177C } /* Literal.String.Symbol */
+.codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
+.codehilite .fm { color: #0000FF } /* Name.Function.Magic */
+.codehilite .vc { color: #19177C } /* Name.Variable.Class */
+.codehilite .vg { color: #19177C } /* Name.Variable.Global */
+.codehilite .vi { color: #19177C } /* Name.Variable.Instance */
+.codehilite .vm { color: #19177C } /* Name.Variable.Magic */
+.codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
diff --git a/md2html/static/template.html b/src/md2html/static/template.html
similarity index 100%
rename from md2html/static/template.html
rename to src/md2html/static/template.html
index 14a8a99..56fcca1 100644
--- a/md2html/static/template.html
+++ b/src/md2html/static/template.html
@@ -3,9 +3,9 @@
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1">
         {css}
+        {script}
     </head>
     <body>
-        {script}
         <article class="markdown-body">
             {content}
         </article>
diff --git a/src/md2html/uwsgi_handler.py b/src/md2html/uwsgi_handler.py
new file mode 100644
index 0000000..e9380f8
--- /dev/null
+++ b/src/md2html/uwsgi_handler.py
@@ -0,0 +1,25 @@
+import logging
+from .server import Server
+from uwsgi import log
+class UwsgiHandler(logging.Handler):
+
+    def emit(self, record: logging.LogRecord) -> None:
+        log(self.formatter.format(record))
+
+
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s [%(threadName)s] (%(name)s) %(levelname)s %(message)s',
+    handlers=[UwsgiHandler()]
+)
+
+server = Server()
+
+def application(env, start_response):
+    return server.handle_request(
+        env['REQUEST_METHOD'],
+        env['PATH_INFO'],
+        env.get('HTTP_IF_NONE_MATCH', None),
+        env.get('QUERY_STRING', None),
+        start_response
+    )