diff --git a/cmd/eksterd/app.go b/cmd/eksterd/app.go
new file mode 100644
index 0000000..0951bad
--- /dev/null
+++ b/cmd/eksterd/app.go
@@ -0,0 +1,77 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/pkg/errors"
+	"p83.nl/go/ekster/pkg/server"
+)
+
+// App is the main app structure
+type App struct {
+	options    AppOptions
+	backend    *memoryBackend
+	hubBackend *hubIncomingBackend
+}
+
+// Run runs the app
+func (app *App) Run() error {
+	err := initSearch()
+	if err != nil {
+		return fmt.Errorf("while starting app: %v", err)
+	}
+	app.backend.run()
+	app.hubBackend.run()
+
+	log.Printf("Listening on port %d\n", app.options.Port)
+	return http.ListenAndServe(fmt.Sprintf(":%d", app.options.Port), nil)
+}
+
+// NewApp initializes the App
+func NewApp(options AppOptions) (*App, error) {
+	app := &App{
+		options: options,
+	}
+
+	backend, err := loadMemoryBackend(options.pool, options.database)
+	if err != nil {
+		return nil, err
+	}
+	app.backend = backend
+	app.backend.AuthEnabled = options.AuthEnabled
+	app.backend.baseURL = options.BaseURL
+	app.backend.hubIncomingBackend.pool = options.pool
+	app.backend.hubIncomingBackend.baseURL = options.BaseURL
+
+	app.hubBackend = &hubIncomingBackend{backend: app.backend, baseURL: options.BaseURL, pool: options.pool}
+
+	http.Handle("/micropub", &micropubHandler{
+		Backend: app.backend,
+		pool:    options.pool,
+	})
+
+	handler, broker := server.NewMicrosubHandler(app.backend)
+	if options.AuthEnabled {
+		handler = WithAuth(handler, app.backend)
+	}
+
+	app.backend.broker = broker
+
+	http.Handle("/microsub", handler)
+
+	http.Handle("/incoming/", &incomingHandler{
+		Backend: app.hubBackend,
+	})
+
+	if !options.Headless {
+		handler, err := newMainHandler(app.backend, options.BaseURL, options.TemplateDir, options.pool)
+		if err != nil {
+			return nil, errors.Wrap(err, "could not create main handler")
+		}
+		http.Handle("/", handler)
+	}
+
+	return app, nil
+}
diff --git a/cmd/eksterd/main.go b/cmd/eksterd/main.go
index ff57452..3bdd35d 100644
--- a/cmd/eksterd/main.go
+++ b/cmd/eksterd/main.go
@@ -18,17 +18,13 @@ package main
 import (
 	"database/sql"
 	"flag"
-	"fmt"
 	"log"
 	"net/http"
 	"os"
 	"time"
 
 	"github.com/gomodule/redigo/redis"
-	"github.com/pkg/errors"
 	"p83.nl/go/ekster/pkg/auth"
-
-	"p83.nl/go/ekster/pkg/server"
 )
 
 // AppOptions are options for the app
@@ -95,73 +91,6 @@ func WithAuth(handler http.Handler, b *memoryBackend) http.Handler {
 	})
 }
 
-// App is the main app structure
-type App struct {
-	options    AppOptions
-	backend    *memoryBackend
-	hubBackend *hubIncomingBackend
-}
-
-// Run runs the app
-func (app *App) Run() error {
-	err := initSearch()
-	if err != nil {
-		return fmt.Errorf("while starting app: %v", err)
-	}
-	app.backend.run()
-	app.hubBackend.run()
-
-	log.Printf("Listening on port %d\n", app.options.Port)
-	return http.ListenAndServe(fmt.Sprintf(":%d", app.options.Port), nil)
-}
-
-// NewApp initializes the App
-func NewApp(options AppOptions) (*App, error) {
-	app := &App{
-		options: options,
-	}
-
-	backend, err := loadMemoryBackend(options.pool, options.database)
-	if err != nil {
-		return nil, err
-	}
-	app.backend = backend
-	app.backend.AuthEnabled = options.AuthEnabled
-	app.backend.baseURL = options.BaseURL
-	app.backend.hubIncomingBackend.pool = options.pool
-	app.backend.hubIncomingBackend.baseURL = options.BaseURL
-
-	app.hubBackend = &hubIncomingBackend{backend: app.backend, baseURL: options.BaseURL, pool: options.pool}
-
-	http.Handle("/micropub", &micropubHandler{
-		Backend: app.backend,
-		pool:    options.pool,
-	})
-
-	handler, broker := server.NewMicrosubHandler(app.backend)
-	if options.AuthEnabled {
-		handler = WithAuth(handler, app.backend)
-	}
-
-	app.backend.broker = broker
-
-	http.Handle("/microsub", handler)
-
-	http.Handle("/incoming/", &incomingHandler{
-		Backend: app.hubBackend,
-	})
-
-	if !options.Headless {
-		handler, err := newMainHandler(app.backend, options.BaseURL, options.TemplateDir, options.pool)
-		if err != nil {
-			return nil, errors.Wrap(err, "could not create main handler")
-		}
-		http.Handle("/", handler)
-	}
-
-	return app, nil
-}
-
 func main() {
 	log.Println("eksterd - microsub server")