diff --git a/mod/init.lua b/mod/init.lua
new file mode 100644
index 0000000..e69de29
diff --git a/.gitignore b/server/.gitignore
similarity index 100%
rename from .gitignore
rename to server/.gitignore
diff --git a/Makefile b/server/Makefile
similarity index 100%
rename from Makefile
rename to server/Makefile
diff --git a/app/app.go b/server/app/app.go
similarity index 100%
rename from app/app.go
rename to server/app/app.go
diff --git a/app/config.go b/server/app/config.go
similarity index 100%
rename from app/config.go
rename to server/app/config.go
diff --git a/app/setup.go b/server/app/setup.go
similarity index 100%
rename from app/setup.go
rename to server/app/setup.go
diff --git a/colormapping/colormapping.go b/server/colormapping/colormapping.go
similarity index 100%
rename from colormapping/colormapping.go
rename to server/colormapping/colormapping.go
diff --git a/colormapping/colormapping_test.go b/server/colormapping/colormapping_test.go
similarity index 100%
rename from colormapping/colormapping_test.go
rename to server/colormapping/colormapping_test.go
diff --git a/colormapping/logger.go b/server/colormapping/logger.go
similarity index 100%
rename from colormapping/logger.go
rename to server/colormapping/logger.go
diff --git a/coords/convert.go b/server/coords/convert.go
similarity index 100%
rename from coords/convert.go
rename to server/coords/convert.go
diff --git a/coords/convert_test.go b/server/coords/convert_test.go
similarity index 100%
rename from coords/convert_test.go
rename to server/coords/convert_test.go
diff --git a/coords/mapblockcoords.go b/server/coords/mapblockcoords.go
similarity index 100%
rename from coords/mapblockcoords.go
rename to server/coords/mapblockcoords.go
diff --git a/coords/tileconvert.go b/server/coords/tileconvert.go
similarity index 100%
rename from coords/tileconvert.go
rename to server/coords/tileconvert.go
diff --git a/coords/tileconvert_test.go b/server/coords/tileconvert_test.go
similarity index 100%
rename from coords/tileconvert_test.go
rename to server/coords/tileconvert_test.go
diff --git a/coords/tilecoords.go b/server/coords/tilecoords.go
similarity index 100%
rename from coords/tilecoords.go
rename to server/coords/tilecoords.go
diff --git a/db/accessor.go b/server/db/accessor.go
similarity index 100%
rename from db/accessor.go
rename to server/db/accessor.go
diff --git a/db/logger.go b/server/db/logger.go
similarity index 100%
rename from db/logger.go
rename to server/db/logger.go
diff --git a/db/sqlite.go b/server/db/sqlite.go
similarity index 100%
rename from db/sqlite.go
rename to server/db/sqlite.go
diff --git a/db/sqlite_test.go b/server/db/sqlite_test.go
similarity index 100%
rename from db/sqlite_test.go
rename to server/db/sqlite_test.go
diff --git a/go.mod b/server/go.mod
similarity index 100%
rename from go.mod
rename to server/go.mod
diff --git a/go.sum b/server/go.sum
similarity index 100%
rename from go.sum
rename to server/go.sum
diff --git a/initialrenderer/job.go b/server/initialrenderer/job.go
similarity index 100%
rename from initialrenderer/job.go
rename to server/initialrenderer/job.go
diff --git a/layer/layer.go b/server/layer/layer.go
similarity index 100%
rename from layer/layer.go
rename to server/layer/layer.go
diff --git a/main.go b/server/main.go
similarity index 100%
rename from main.go
rename to server/main.go
diff --git a/mapblockaccessor/logger.go b/server/mapblockaccessor/logger.go
similarity index 100%
rename from mapblockaccessor/logger.go
rename to server/mapblockaccessor/logger.go
diff --git a/mapblockaccessor/mapblockaccessor.go b/server/mapblockaccessor/mapblockaccessor.go
similarity index 100%
rename from mapblockaccessor/mapblockaccessor.go
rename to server/mapblockaccessor/mapblockaccessor.go
diff --git a/mapblockaccessor/mapblockaccessor_test.go b/server/mapblockaccessor/mapblockaccessor_test.go
similarity index 100%
rename from mapblockaccessor/mapblockaccessor_test.go
rename to server/mapblockaccessor/mapblockaccessor_test.go
diff --git a/mapblockparser/countedreader.go b/server/mapblockparser/countedreader.go
similarity index 100%
rename from mapblockparser/countedreader.go
rename to server/mapblockparser/countedreader.go
diff --git a/mapblockparser/logger.go b/server/mapblockparser/logger.go
similarity index 100%
rename from mapblockparser/logger.go
rename to server/mapblockparser/logger.go
diff --git a/mapblockparser/mapblock.go b/server/mapblockparser/mapblock.go
similarity index 100%
rename from mapblockparser/mapblock.go
rename to server/mapblockparser/mapblock.go
diff --git a/mapblockparser/mapdata.go b/server/mapblockparser/mapdata.go
similarity index 100%
rename from mapblockparser/mapdata.go
rename to server/mapblockparser/mapdata.go
diff --git a/mapblockparser/metadata.go b/server/mapblockparser/metadata.go
similarity index 100%
rename from mapblockparser/metadata.go
rename to server/mapblockparser/metadata.go
diff --git a/mapblockparser/parse.go b/server/mapblockparser/parse.go
similarity index 100%
rename from mapblockparser/parse.go
rename to server/mapblockparser/parse.go
diff --git a/mapblockparser/parse_test.go b/server/mapblockparser/parse_test.go
similarity index 100%
rename from mapblockparser/parse_test.go
rename to server/mapblockparser/parse_test.go
diff --git a/mapblockparser/testdata/0.-1.0 b/server/mapblockparser/testdata/0.-1.0
similarity index 100%
rename from mapblockparser/testdata/0.-1.0
rename to server/mapblockparser/testdata/0.-1.0
diff --git a/mapblockparser/testdata/0.0.0 b/server/mapblockparser/testdata/0.0.0
similarity index 100%
rename from mapblockparser/testdata/0.0.0
rename to server/mapblockparser/testdata/0.0.0
diff --git a/mapblockparser/testdata/0.1.0 b/server/mapblockparser/testdata/0.1.0
similarity index 100%
rename from mapblockparser/testdata/0.1.0
rename to server/mapblockparser/testdata/0.1.0
diff --git a/mapblockparser/testdata/0.10.0 b/server/mapblockparser/testdata/0.10.0
similarity index 100%
rename from mapblockparser/testdata/0.10.0
rename to server/mapblockparser/testdata/0.10.0
diff --git a/mapblockparser/testdata/0.2.0 b/server/mapblockparser/testdata/0.2.0
similarity index 100%
rename from mapblockparser/testdata/0.2.0
rename to server/mapblockparser/testdata/0.2.0
diff --git a/mapblockparser/testdata/0.3.0 b/server/mapblockparser/testdata/0.3.0
similarity index 100%
rename from mapblockparser/testdata/0.3.0
rename to server/mapblockparser/testdata/0.3.0
diff --git a/mapblockparser/testdata/0.4.0 b/server/mapblockparser/testdata/0.4.0
similarity index 100%
rename from mapblockparser/testdata/0.4.0
rename to server/mapblockparser/testdata/0.4.0
diff --git a/mapblockparser/testdata/0.5.0 b/server/mapblockparser/testdata/0.5.0
similarity index 100%
rename from mapblockparser/testdata/0.5.0
rename to server/mapblockparser/testdata/0.5.0
diff --git a/mapblockparser/testdata/0.6.0 b/server/mapblockparser/testdata/0.6.0
similarity index 100%
rename from mapblockparser/testdata/0.6.0
rename to server/mapblockparser/testdata/0.6.0
diff --git a/mapblockparser/testdata/0.7.0 b/server/mapblockparser/testdata/0.7.0
similarity index 100%
rename from mapblockparser/testdata/0.7.0
rename to server/mapblockparser/testdata/0.7.0
diff --git a/mapblockparser/testdata/0.8.0 b/server/mapblockparser/testdata/0.8.0
similarity index 100%
rename from mapblockparser/testdata/0.8.0
rename to server/mapblockparser/testdata/0.8.0
diff --git a/mapblockparser/testdata/0.9.0 b/server/mapblockparser/testdata/0.9.0
similarity index 100%
rename from mapblockparser/testdata/0.9.0
rename to server/mapblockparser/testdata/0.9.0
diff --git a/mapblockparser/testdata/11.0.2 b/server/mapblockparser/testdata/11.0.2
similarity index 100%
rename from mapblockparser/testdata/11.0.2
rename to server/mapblockparser/testdata/11.0.2
diff --git a/mapblockparser/testdata/mb-with-metadata.bin b/server/mapblockparser/testdata/mb-with-metadata.bin
similarity index 100%
rename from mapblockparser/testdata/mb-with-metadata.bin
rename to server/mapblockparser/testdata/mb-with-metadata.bin
diff --git a/mapblockrenderer/logger.go b/server/mapblockrenderer/logger.go
similarity index 100%
rename from mapblockrenderer/logger.go
rename to server/mapblockrenderer/logger.go
diff --git a/mapblockrenderer/renderer.go b/server/mapblockrenderer/renderer.go
similarity index 100%
rename from mapblockrenderer/renderer.go
rename to server/mapblockrenderer/renderer.go
diff --git a/mapblockrenderer/renderer_test.go b/server/mapblockrenderer/renderer_test.go
similarity index 100%
rename from mapblockrenderer/renderer_test.go
rename to server/mapblockrenderer/renderer_test.go
diff --git a/mapblockrenderer/worker.go b/server/mapblockrenderer/worker.go
similarity index 100%
rename from mapblockrenderer/worker.go
rename to server/mapblockrenderer/worker.go
diff --git a/mapobject/clearmapdata.go b/server/mapobject/clearmapdata.go
similarity index 100%
rename from mapobject/clearmapdata.go
rename to server/mapobject/clearmapdata.go
diff --git a/mapobject/poi.go b/server/mapobject/poi.go
similarity index 100%
rename from mapobject/poi.go
rename to server/mapobject/poi.go
diff --git a/mapobjectdb/accessor.go b/server/mapobjectdb/accessor.go
similarity index 100%
rename from mapobjectdb/accessor.go
rename to server/mapobjectdb/accessor.go
diff --git a/mapobjectdb/logger.go b/server/mapobjectdb/logger.go
similarity index 100%
rename from mapobjectdb/logger.go
rename to server/mapobjectdb/logger.go
diff --git a/mapobjectdb/sqlite_mapobjects.go b/server/mapobjectdb/sqlite_mapobjects.go
similarity index 100%
rename from mapobjectdb/sqlite_mapobjects.go
rename to server/mapobjectdb/sqlite_mapobjects.go
diff --git a/mapobjectdb/sqlite_migrate.go b/server/mapobjectdb/sqlite_migrate.go
similarity index 100%
rename from mapobjectdb/sqlite_migrate.go
rename to server/mapobjectdb/sqlite_migrate.go
diff --git a/mapobjectdb/sqlite_test.go b/server/mapobjectdb/sqlite_test.go
similarity index 100%
rename from mapobjectdb/sqlite_test.go
rename to server/mapobjectdb/sqlite_test.go
diff --git a/mapobjectdb/sqlite_tiles.go b/server/mapobjectdb/sqlite_tiles.go
similarity index 100%
rename from mapobjectdb/sqlite_tiles.go
rename to server/mapobjectdb/sqlite_tiles.go
diff --git a/params/params.go b/server/params/params.go
similarity index 100%
rename from params/params.go
rename to server/params/params.go
diff --git a/static/colors.txt b/server/static/colors.txt
similarity index 100%
rename from static/colors.txt
rename to server/static/colors.txt
diff --git a/static/css/images/layers-2x.png b/server/static/css/images/layers-2x.png
similarity index 100%
rename from static/css/images/layers-2x.png
rename to server/static/css/images/layers-2x.png
diff --git a/static/css/images/layers.png b/server/static/css/images/layers.png
similarity index 100%
rename from static/css/images/layers.png
rename to server/static/css/images/layers.png
diff --git a/static/css/images/marker-icon-2x.png b/server/static/css/images/marker-icon-2x.png
similarity index 100%
rename from static/css/images/marker-icon-2x.png
rename to server/static/css/images/marker-icon-2x.png
diff --git a/static/css/images/marker-icon-green.png b/server/static/css/images/marker-icon-green.png
similarity index 100%
rename from static/css/images/marker-icon-green.png
rename to server/static/css/images/marker-icon-green.png
diff --git a/static/css/images/marker-icon-red.png b/server/static/css/images/marker-icon-red.png
similarity index 100%
rename from static/css/images/marker-icon-red.png
rename to server/static/css/images/marker-icon-red.png
diff --git a/static/css/images/marker-icon.png b/server/static/css/images/marker-icon.png
similarity index 100%
rename from static/css/images/marker-icon.png
rename to server/static/css/images/marker-icon.png
diff --git a/static/css/images/marker-shadow.png b/server/static/css/images/marker-shadow.png
similarity index 100%
rename from static/css/images/marker-shadow.png
rename to server/static/css/images/marker-shadow.png
diff --git a/static/css/leaflet.css b/server/static/css/leaflet.css
similarity index 100%
rename from static/css/leaflet.css
rename to server/static/css/leaflet.css
diff --git a/static/index.html b/server/static/index.html
similarity index 100%
rename from static/index.html
rename to server/static/index.html
diff --git a/static/js/lib/leaflet.js b/server/static/js/lib/leaflet.js
similarity index 100%
rename from static/js/lib/leaflet.js
rename to server/static/js/lib/leaflet.js
diff --git a/static/js/lib/mithril.min.js b/server/static/js/lib/mithril.min.js
similarity index 100%
rename from static/js/lib/mithril.min.js
rename to server/static/js/lib/mithril.min.js
diff --git a/static/js/lib/moment.min.js b/server/static/js/lib/moment.min.js
similarity index 100%
rename from static/js/lib/moment.min.js
rename to server/static/js/lib/moment.min.js
diff --git a/static/js/main.js b/server/static/js/main.js
similarity index 100%
rename from static/js/main.js
rename to server/static/js/main.js
diff --git a/testutils/database.go b/server/testutils/database.go
similarity index 100%
rename from testutils/database.go
rename to server/testutils/database.go
diff --git a/testutils/testdata/map2.sqlite b/server/testutils/testdata/map2.sqlite
similarity index 100%
rename from testutils/testdata/map2.sqlite
rename to server/testutils/testdata/map2.sqlite
diff --git a/tilerenderer/logger.go b/server/tilerenderer/logger.go
similarity index 100%
rename from tilerenderer/logger.go
rename to server/tilerenderer/logger.go
diff --git a/tilerenderer/renderer.go b/server/tilerenderer/renderer.go
similarity index 100%
rename from tilerenderer/renderer.go
rename to server/tilerenderer/renderer.go
diff --git a/tilerenderer/renderer_test.go b/server/tilerenderer/renderer_test.go
similarity index 100%
rename from tilerenderer/renderer_test.go
rename to server/tilerenderer/renderer_test.go
diff --git a/tileupdate/job.go b/server/tileupdate/job.go
similarity index 100%
rename from tileupdate/job.go
rename to server/tileupdate/job.go
diff --git a/vfs/.gitignore b/server/vfs/.gitignore
similarity index 100%
rename from vfs/.gitignore
rename to server/vfs/.gitignore
diff --git a/web/config.go b/server/web/config.go
similarity index 100%
rename from web/config.go
rename to server/web/config.go
diff --git a/web/mapblock.go b/server/web/mapblock.go
similarity index 100%
rename from web/mapblock.go
rename to server/web/mapblock.go
diff --git a/web/serve.go b/server/web/serve.go
similarity index 100%
rename from web/serve.go
rename to server/web/serve.go
diff --git a/web/tiles.go b/server/web/tiles.go
similarity index 100%
rename from web/tiles.go
rename to server/web/tiles.go
diff --git a/web/ws.go b/server/web/ws.go
similarity index 100%
rename from web/ws.go
rename to server/web/ws.go
diff --git a/worldconfig/parse.go b/server/worldconfig/parse.go
similarity index 100%
rename from worldconfig/parse.go
rename to server/worldconfig/parse.go
diff --git a/worldconfig/parse_test.go b/server/worldconfig/parse_test.go
similarity index 100%
rename from worldconfig/parse_test.go
rename to server/worldconfig/parse_test.go
diff --git a/worldconfig/testdata/world.mt.postgres b/server/worldconfig/testdata/world.mt.postgres
similarity index 100%
rename from worldconfig/testdata/world.mt.postgres
rename to server/worldconfig/testdata/world.mt.postgres
diff --git a/worldconfig/testdata/world.mt.sqlite b/server/worldconfig/testdata/world.mt.sqlite
similarity index 100%
rename from worldconfig/testdata/world.mt.sqlite
rename to server/worldconfig/testdata/world.mt.sqlite
diff --git a/testutils/testdata/map.sqlite b/testutils/testdata/map.sqlite
deleted file mode 100644
index d4c5728..0000000
Binary files a/testutils/testdata/map.sqlite and /dev/null differ