diff --git a/server/.dockerignore b/.dockerignore
similarity index 100%
rename from server/.dockerignore
rename to .dockerignore
diff --git a/.gitignore b/.gitignore
index 16f5c76..563abfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
-output
 .releasetoken
+mapserver
+world.mt
+output
+test-output
+map.sqlite
+mapserver.tiles
+mapserver.sqlite
+mapserver.sqlite-journal
+mapserver.json
+debug.txt
diff --git a/server/Dockerfile b/Dockerfile
similarity index 100%
rename from server/Dockerfile
rename to Dockerfile
diff --git a/Makefile b/Makefile
index e8edb52..1c38f3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,74 @@
-
+STATIC_VFS=vfs/static.go
 OUT_DIR=output
+ENV=GO111MODULE=on
 VERSION=git-$(shell git rev-parse HEAD)
 
-all: builder_image $(OUT_DIR) $(MOD_ZIP)
+
+# -ldflags="-X mapserver/app.Version=1.0"
+GO_LDFLAGS=-ldflags "-linkmode external -extldflags -static -X mapserver/app.Version=$(VERSION)"
+GO_LDFLAGS_WIN=-ldflags "-X mapserver/app.Version=$(VERSION)"
+GO_BUILD=CGO_ENABLED=1 go build
+
+BINARIES =  $(OUT_DIR)/mapserver-linux-x86_64
+BINARIES += $(OUT_DIR)/mapserver-linux-x86
+BINARIES += $(OUT_DIR)/mapserver-windows-x86.exe
+BINARIES += $(OUT_DIR)/mapserver-windows-x86-64.exe
+BINARIES += $(OUT_DIR)/mapserver-linux-arm
+
+
+all: $(STATIC_VFS)
+	go build
+
+$(OUT_DIR):
+	mkdir $@
+
+fmt:
+	go fmt ./...
+
+test: $(OUT_DIR)
+	go generate
+	go build
+	go vet ./...
+	$(ENV) go test ./...
+
+clean:
+	rm -rf $(STATIC_VFS) test-output
+	rm -rf $(OUT_DIR)
+
+jshint:
+	jshint static/js/*.js static/js/util static/js/overlays static/js/search
+
+$(STATIC_VFS):
+	go generate
+
+$(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)
+	# native (linux x86_64)
+	GOOS=linux GOARCH=amd64 CC=x86_64-linux-gnu-gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@
+
+$(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR)
+	# apt install gcc-8-i686-linux-gnu
+	GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc-7 $(GO_BUILD) $(GO_LDFLAGS) -o $@
+
+$(OUT_DIR)/mapserver-windows-x86.exe: $(OUT_DIR)
+	# apt install gcc-mingw-w64
+	GOARCH=386 GOOS=windows CC=i686-w64-mingw32-gcc $(GO_BUILD) $(GO_LDFLAGS_WIN) -o $@
+
+$(OUT_DIR)/mapserver-windows-x86-64.exe: $(OUT_DIR)
+	GOARCH=amd64 GOOS=windows CC=x86_64-w64-mingw32-gcc $(GO_BUILD) $(GO_LDFLAGS_WIN) -o $@
+
+$(OUT_DIR)/mapserver-linux-arm: $(OUT_DIR)
+	# apt install gcc-5-arm-linux-gnueabihf
+	GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-5 $(GO_BUILD) $(GO_LDFLAGS) -o $@
+
+
+release: builder_image $(OUT_DIR) $(MOD_ZIP)
 	# build all with the docker image
 	sudo docker run --rm -it\
 	 -v $(shell pwd)/server/:/app\
 	 -v mapserver-volume:/root/go\
 	 -w /app\
 	 mapserver-builder\
-	 make test jshint all VERSION=$(VERSION)
+	 make test jshint release-all VERSION=$(VERSION)
 	# copy generated files to output dir
 	cp server/output/* $(OUT_DIR)/
 
@@ -17,9 +76,4 @@ builder_image:
 	# build the docker image with all dependencies
 	$(MAKE) -C docker_builder build
 
-$(OUT_DIR):
-	mkdir $@
-
-clean:
-	rm -rf $(OUT_DIR)
-	$(MAKE) -C server clean
+release-all: $(STATIC_VFS) $(BINARIES)
diff --git a/server/app/app.go b/app/app.go
similarity index 100%
rename from server/app/app.go
rename to app/app.go
diff --git a/server/app/config.go b/app/config.go
similarity index 100%
rename from server/app/config.go
rename to app/config.go
diff --git a/server/app/setup.go b/app/setup.go
similarity index 100%
rename from server/app/setup.go
rename to app/setup.go
diff --git a/server/app/util.go b/app/util.go
similarity index 100%
rename from server/app/util.go
rename to app/util.go
diff --git a/server/app/version.go b/app/version.go
similarity index 100%
rename from server/app/version.go
rename to app/version.go
diff --git a/server/areasparser/parser.go b/areasparser/parser.go
similarity index 100%
rename from server/areasparser/parser.go
rename to areasparser/parser.go
diff --git a/server/areasparser/parser_test.go b/areasparser/parser_test.go
similarity index 100%
rename from server/areasparser/parser_test.go
rename to areasparser/parser_test.go
diff --git a/server/areasparser/testdata/areas.dat b/areasparser/testdata/areas.dat
similarity index 100%
rename from server/areasparser/testdata/areas.dat
rename to areasparser/testdata/areas.dat
diff --git a/server/bundle/CSSHandler.go b/bundle/CSSHandler.go
similarity index 100%
rename from server/bundle/CSSHandler.go
rename to bundle/CSSHandler.go
diff --git a/server/bundle/JsHandler.go b/bundle/JsHandler.go
similarity index 100%
rename from server/bundle/JsHandler.go
rename to bundle/JsHandler.go
diff --git a/server/bundle/Manifest.go b/bundle/Manifest.go
similarity index 100%
rename from server/bundle/Manifest.go
rename to bundle/Manifest.go
diff --git a/server/bundle/bundle.go b/bundle/bundle.go
similarity index 100%
rename from server/bundle/bundle.go
rename to bundle/bundle.go
diff --git a/server/colormapping/colormapping.go b/colormapping/colormapping.go
similarity index 100%
rename from server/colormapping/colormapping.go
rename to colormapping/colormapping.go
diff --git a/server/colormapping/colormapping_test.go b/colormapping/colormapping_test.go
similarity index 100%
rename from server/colormapping/colormapping_test.go
rename to colormapping/colormapping_test.go
diff --git a/server/colormapping/logger.go b/colormapping/logger.go
similarity index 100%
rename from server/colormapping/logger.go
rename to colormapping/logger.go
diff --git a/server/colors.txt b/colors.txt
similarity index 100%
rename from server/colors.txt
rename to colors.txt
diff --git a/server/coords/convert.go b/coords/convert.go
similarity index 100%
rename from server/coords/convert.go
rename to coords/convert.go
diff --git a/server/coords/convert_test.go b/coords/convert_test.go
similarity index 100%
rename from server/coords/convert_test.go
rename to coords/convert_test.go
diff --git a/server/coords/mapblockcoords.go b/coords/mapblockcoords.go
similarity index 100%
rename from server/coords/mapblockcoords.go
rename to coords/mapblockcoords.go
diff --git a/server/coords/tileconvert.go b/coords/tileconvert.go
similarity index 100%
rename from server/coords/tileconvert.go
rename to coords/tileconvert.go
diff --git a/server/coords/tileconvert_test.go b/coords/tileconvert_test.go
similarity index 100%
rename from server/coords/tileconvert_test.go
rename to coords/tileconvert_test.go
diff --git a/server/coords/tilecoords.go b/coords/tilecoords.go
similarity index 100%
rename from server/coords/tilecoords.go
rename to coords/tilecoords.go
diff --git a/server/db/accessor.go b/db/accessor.go
similarity index 100%
rename from server/db/accessor.go
rename to db/accessor.go
diff --git a/server/db/postgres/initialblocks.go b/db/postgres/initialblocks.go
similarity index 100%
rename from server/db/postgres/initialblocks.go
rename to db/postgres/initialblocks.go
diff --git a/server/db/postgres/logger.go b/db/postgres/logger.go
similarity index 100%
rename from server/db/postgres/logger.go
rename to db/postgres/logger.go
diff --git a/server/db/postgres/postgres.go b/db/postgres/postgres.go
similarity index 100%
rename from server/db/postgres/postgres.go
rename to db/postgres/postgres.go
diff --git a/server/db/postgres/sql.go b/db/postgres/sql.go
similarity index 100%
rename from server/db/postgres/sql.go
rename to db/postgres/sql.go
diff --git a/server/db/postgres/util.go b/db/postgres/util.go
similarity index 100%
rename from server/db/postgres/util.go
rename to db/postgres/util.go
diff --git a/server/db/sqlite/initialblocks.go b/db/sqlite/initialblocks.go
similarity index 100%
rename from server/db/sqlite/initialblocks.go
rename to db/sqlite/initialblocks.go
diff --git a/server/db/sqlite/logger.go b/db/sqlite/logger.go
similarity index 100%
rename from server/db/sqlite/logger.go
rename to db/sqlite/logger.go
diff --git a/server/db/sqlite/sql.go b/db/sqlite/sql.go
similarity index 100%
rename from server/db/sqlite/sql.go
rename to db/sqlite/sql.go
diff --git a/server/db/sqlite/sqlite.go b/db/sqlite/sqlite.go
similarity index 100%
rename from server/db/sqlite/sqlite.go
rename to db/sqlite/sqlite.go
diff --git a/server/db/sqlite/sqlite_test.go b/db/sqlite/sqlite_test.go
similarity index 100%
rename from server/db/sqlite/sqlite_test.go
rename to db/sqlite/sqlite_test.go
diff --git a/server/eventbus/eventbus.go b/eventbus/eventbus.go
similarity index 100%
rename from server/eventbus/eventbus.go
rename to eventbus/eventbus.go
diff --git a/server/go.mod b/go.mod
similarity index 100%
rename from server/go.mod
rename to go.mod
diff --git a/server/go.sum b/go.sum
similarity index 100%
rename from server/go.sum
rename to go.sum
diff --git a/server/layer/layer.go b/layer/layer.go
similarity index 100%
rename from server/layer/layer.go
rename to layer/layer.go
diff --git a/server/luaparser/luaparser.go b/luaparser/luaparser.go
similarity index 100%
rename from server/luaparser/luaparser.go
rename to luaparser/luaparser.go
diff --git a/server/luaparser/luaparser_test.go b/luaparser/luaparser_test.go
similarity index 100%
rename from server/luaparser/luaparser_test.go
rename to luaparser/luaparser_test.go
diff --git a/server/main.go b/main.go
similarity index 100%
rename from server/main.go
rename to main.go
diff --git a/server/mapblockaccessor/get.go b/mapblockaccessor/get.go
similarity index 100%
rename from server/mapblockaccessor/get.go
rename to mapblockaccessor/get.go
diff --git a/server/mapblockaccessor/legacyblocks.go b/mapblockaccessor/legacyblocks.go
similarity index 100%
rename from server/mapblockaccessor/legacyblocks.go
rename to mapblockaccessor/legacyblocks.go
diff --git a/server/mapblockaccessor/logger.go b/mapblockaccessor/logger.go
similarity index 100%
rename from server/mapblockaccessor/logger.go
rename to mapblockaccessor/logger.go
diff --git a/server/mapblockaccessor/mapblockaccessor.go b/mapblockaccessor/mapblockaccessor.go
similarity index 100%
rename from server/mapblockaccessor/mapblockaccessor.go
rename to mapblockaccessor/mapblockaccessor.go
diff --git a/server/mapblockaccessor/mapblockaccessor_test.go b/mapblockaccessor/mapblockaccessor_test.go
similarity index 100%
rename from server/mapblockaccessor/mapblockaccessor_test.go
rename to mapblockaccessor/mapblockaccessor_test.go
diff --git a/server/mapblockaccessor/mtime.go b/mapblockaccessor/mtime.go
similarity index 100%
rename from server/mapblockaccessor/mtime.go
rename to mapblockaccessor/mtime.go
diff --git a/server/mapblockaccessor/prometheus.go b/mapblockaccessor/prometheus.go
similarity index 100%
rename from server/mapblockaccessor/prometheus.go
rename to mapblockaccessor/prometheus.go
diff --git a/server/mapblockaccessor/update.go b/mapblockaccessor/update.go
similarity index 100%
rename from server/mapblockaccessor/update.go
rename to mapblockaccessor/update.go
diff --git a/server/mapblockparser/countedreader.go b/mapblockparser/countedreader.go
similarity index 100%
rename from server/mapblockparser/countedreader.go
rename to mapblockparser/countedreader.go
diff --git a/server/mapblockparser/iterate.go b/mapblockparser/iterate.go
similarity index 100%
rename from server/mapblockparser/iterate.go
rename to mapblockparser/iterate.go
diff --git a/server/mapblockparser/logger.go b/mapblockparser/logger.go
similarity index 100%
rename from server/mapblockparser/logger.go
rename to mapblockparser/logger.go
diff --git a/server/mapblockparser/mapblock.go b/mapblockparser/mapblock.go
similarity index 100%
rename from server/mapblockparser/mapblock.go
rename to mapblockparser/mapblock.go
diff --git a/server/mapblockparser/mapdata.go b/mapblockparser/mapdata.go
similarity index 100%
rename from server/mapblockparser/mapdata.go
rename to mapblockparser/mapdata.go
diff --git a/server/mapblockparser/metadata.go b/mapblockparser/metadata.go
similarity index 100%
rename from server/mapblockparser/metadata.go
rename to mapblockparser/metadata.go
diff --git a/server/mapblockparser/parse.go b/mapblockparser/parse.go
similarity index 100%
rename from server/mapblockparser/parse.go
rename to mapblockparser/parse.go
diff --git a/server/mapblockparser/parse_test.go b/mapblockparser/parse_test.go
similarity index 100%
rename from server/mapblockparser/parse_test.go
rename to mapblockparser/parse_test.go
diff --git a/server/mapblockparser/prometheus.go b/mapblockparser/prometheus.go
similarity index 100%
rename from server/mapblockparser/prometheus.go
rename to mapblockparser/prometheus.go
diff --git a/server/mapblockparser/testdata/0.-1.0 b/mapblockparser/testdata/0.-1.0
similarity index 100%
rename from server/mapblockparser/testdata/0.-1.0
rename to mapblockparser/testdata/0.-1.0
diff --git a/server/mapblockparser/testdata/0.0.0 b/mapblockparser/testdata/0.0.0
similarity index 100%
rename from server/mapblockparser/testdata/0.0.0
rename to mapblockparser/testdata/0.0.0
diff --git a/server/mapblockparser/testdata/0.1.0 b/mapblockparser/testdata/0.1.0
similarity index 100%
rename from server/mapblockparser/testdata/0.1.0
rename to mapblockparser/testdata/0.1.0
diff --git a/server/mapblockparser/testdata/0.10.0 b/mapblockparser/testdata/0.10.0
similarity index 100%
rename from server/mapblockparser/testdata/0.10.0
rename to mapblockparser/testdata/0.10.0
diff --git a/server/mapblockparser/testdata/0.2.0 b/mapblockparser/testdata/0.2.0
similarity index 100%
rename from server/mapblockparser/testdata/0.2.0
rename to mapblockparser/testdata/0.2.0
diff --git a/server/mapblockparser/testdata/0.3.0 b/mapblockparser/testdata/0.3.0
similarity index 100%
rename from server/mapblockparser/testdata/0.3.0
rename to mapblockparser/testdata/0.3.0
diff --git a/server/mapblockparser/testdata/0.4.0 b/mapblockparser/testdata/0.4.0
similarity index 100%
rename from server/mapblockparser/testdata/0.4.0
rename to mapblockparser/testdata/0.4.0
diff --git a/server/mapblockparser/testdata/0.5.0 b/mapblockparser/testdata/0.5.0
similarity index 100%
rename from server/mapblockparser/testdata/0.5.0
rename to mapblockparser/testdata/0.5.0
diff --git a/server/mapblockparser/testdata/0.6.0 b/mapblockparser/testdata/0.6.0
similarity index 100%
rename from server/mapblockparser/testdata/0.6.0
rename to mapblockparser/testdata/0.6.0
diff --git a/server/mapblockparser/testdata/0.7.0 b/mapblockparser/testdata/0.7.0
similarity index 100%
rename from server/mapblockparser/testdata/0.7.0
rename to mapblockparser/testdata/0.7.0
diff --git a/server/mapblockparser/testdata/0.8.0 b/mapblockparser/testdata/0.8.0
similarity index 100%
rename from server/mapblockparser/testdata/0.8.0
rename to mapblockparser/testdata/0.8.0
diff --git a/server/mapblockparser/testdata/0.9.0 b/mapblockparser/testdata/0.9.0
similarity index 100%
rename from server/mapblockparser/testdata/0.9.0
rename to mapblockparser/testdata/0.9.0
diff --git a/server/mapblockparser/testdata/11.0.2 b/mapblockparser/testdata/11.0.2
similarity index 100%
rename from server/mapblockparser/testdata/11.0.2
rename to mapblockparser/testdata/11.0.2
diff --git a/server/mapblockparser/testdata/mb-with-metadata.bin b/mapblockparser/testdata/mb-with-metadata.bin
similarity index 100%
rename from server/mapblockparser/testdata/mb-with-metadata.bin
rename to mapblockparser/testdata/mb-with-metadata.bin
diff --git a/server/mapblockrenderer/logger.go b/mapblockrenderer/logger.go
similarity index 100%
rename from server/mapblockrenderer/logger.go
rename to mapblockrenderer/logger.go
diff --git a/server/mapblockrenderer/prometheus.go b/mapblockrenderer/prometheus.go
similarity index 100%
rename from server/mapblockrenderer/prometheus.go
rename to mapblockrenderer/prometheus.go
diff --git a/server/mapblockrenderer/renderer.go b/mapblockrenderer/renderer.go
similarity index 100%
rename from server/mapblockrenderer/renderer.go
rename to mapblockrenderer/renderer.go
diff --git a/server/mapblockrenderer/renderer_test.go b/mapblockrenderer/renderer_test.go
similarity index 100%
rename from server/mapblockrenderer/renderer_test.go
rename to mapblockrenderer/renderer_test.go
diff --git a/server/mapblockrenderer/worker.go b/mapblockrenderer/worker.go
similarity index 100%
rename from server/mapblockrenderer/worker.go
rename to mapblockrenderer/worker.go
diff --git a/server/mapobject/atm.go b/mapobject/atm.go
similarity index 100%
rename from server/mapobject/atm.go
rename to mapobject/atm.go
diff --git a/server/mapobject/bones.go b/mapobject/bones.go
similarity index 100%
rename from server/mapobject/bones.go
rename to mapobject/bones.go
diff --git a/server/mapobject/border.go b/mapobject/border.go
similarity index 100%
rename from server/mapobject/border.go
rename to mapobject/border.go
diff --git a/server/mapobject/digilinelcd.go b/mapobject/digilinelcd.go
similarity index 100%
rename from server/mapobject/digilinelcd.go
rename to mapobject/digilinelcd.go
diff --git a/server/mapobject/digiterms.go b/mapobject/digiterms.go
similarity index 100%
rename from server/mapobject/digiterms.go
rename to mapobject/digiterms.go
diff --git a/server/mapobject/fancyvend.go b/mapobject/fancyvend.go
similarity index 100%
rename from server/mapobject/fancyvend.go
rename to mapobject/fancyvend.go
diff --git a/server/mapobject/jumpdrive.go b/mapobject/jumpdrive.go
similarity index 100%
rename from server/mapobject/jumpdrive.go
rename to mapobject/jumpdrive.go
diff --git a/server/mapobject/label.go b/mapobject/label.go
similarity index 100%
rename from server/mapobject/label.go
rename to mapobject/label.go
diff --git a/server/mapobject/listener.go b/mapobject/listener.go
similarity index 100%
rename from server/mapobject/listener.go
rename to mapobject/listener.go
diff --git a/server/mapobject/locator.go b/mapobject/locator.go
similarity index 100%
rename from server/mapobject/locator.go
rename to mapobject/locator.go
diff --git a/server/mapobject/logger.go b/mapobject/logger.go
similarity index 100%
rename from server/mapobject/logger.go
rename to mapobject/logger.go
diff --git a/server/mapobject/luacontroller.go b/mapobject/luacontroller.go
similarity index 100%
rename from server/mapobject/luacontroller.go
rename to mapobject/luacontroller.go
diff --git a/server/mapobject/mission.go b/mapobject/mission.go
similarity index 100%
rename from server/mapobject/mission.go
rename to mapobject/mission.go
diff --git a/server/mapobject/nuclearreactor.go b/mapobject/nuclearreactor.go
similarity index 100%
rename from server/mapobject/nuclearreactor.go
rename to mapobject/nuclearreactor.go
diff --git a/server/mapobject/poi.go b/mapobject/poi.go
similarity index 100%
rename from server/mapobject/poi.go
rename to mapobject/poi.go
diff --git a/server/mapobject/privprotector.go b/mapobject/privprotector.go
similarity index 100%
rename from server/mapobject/privprotector.go
rename to mapobject/privprotector.go
diff --git a/server/mapobject/protector.go b/mapobject/protector.go
similarity index 100%
rename from server/mapobject/protector.go
rename to mapobject/protector.go
diff --git a/server/mapobject/quarry.go b/mapobject/quarry.go
similarity index 100%
rename from server/mapobject/quarry.go
rename to mapobject/quarry.go
diff --git a/server/mapobject/setup.go b/mapobject/setup.go
similarity index 100%
rename from server/mapobject/setup.go
rename to mapobject/setup.go
diff --git a/server/mapobject/smartshop.go b/mapobject/smartshop.go
similarity index 100%
rename from server/mapobject/smartshop.go
rename to mapobject/smartshop.go
diff --git a/server/mapobject/technicanchor.go b/mapobject/technicanchor.go
similarity index 100%
rename from server/mapobject/technicanchor.go
rename to mapobject/technicanchor.go
diff --git a/server/mapobject/technicswitch.go b/mapobject/technicswitch.go
similarity index 100%
rename from server/mapobject/technicswitch.go
rename to mapobject/technicswitch.go
diff --git a/server/mapobject/train.go b/mapobject/train.go
similarity index 100%
rename from server/mapobject/train.go
rename to mapobject/train.go
diff --git a/server/mapobject/travelnet.go b/mapobject/travelnet.go
similarity index 100%
rename from server/mapobject/travelnet.go
rename to mapobject/travelnet.go
diff --git a/server/mapobject/xpprotector.go b/mapobject/xpprotector.go
similarity index 100%
rename from server/mapobject/xpprotector.go
rename to mapobject/xpprotector.go
diff --git a/server/mapobjectdb/accessor.go b/mapobjectdb/accessor.go
similarity index 100%
rename from server/mapobjectdb/accessor.go
rename to mapobjectdb/accessor.go
diff --git a/server/mapobjectdb/accessor_test.go b/mapobjectdb/accessor_test.go
similarity index 100%
rename from server/mapobjectdb/accessor_test.go
rename to mapobjectdb/accessor_test.go
diff --git a/server/mapobjectdb/logger.go b/mapobjectdb/logger.go
similarity index 100%
rename from server/mapobjectdb/logger.go
rename to mapobjectdb/logger.go
diff --git a/server/mapobjectdb/postgres/logger.go b/mapobjectdb/postgres/logger.go
similarity index 100%
rename from server/mapobjectdb/postgres/logger.go
rename to mapobjectdb/postgres/logger.go
diff --git a/server/mapobjectdb/postgres/mapobjects.go b/mapobjectdb/postgres/mapobjects.go
similarity index 100%
rename from server/mapobjectdb/postgres/mapobjects.go
rename to mapobjectdb/postgres/mapobjects.go
diff --git a/server/mapobjectdb/postgres/migrate.go b/mapobjectdb/postgres/migrate.go
similarity index 100%
rename from server/mapobjectdb/postgres/migrate.go
rename to mapobjectdb/postgres/migrate.go
diff --git a/server/mapobjectdb/postgres/new.go b/mapobjectdb/postgres/new.go
similarity index 100%
rename from server/mapobjectdb/postgres/new.go
rename to mapobjectdb/postgres/new.go
diff --git a/server/mapobjectdb/postgres/settings.go b/mapobjectdb/postgres/settings.go
similarity index 100%
rename from server/mapobjectdb/postgres/settings.go
rename to mapobjectdb/postgres/settings.go
diff --git a/server/mapobjectdb/postgres/sql.go b/mapobjectdb/postgres/sql.go
similarity index 100%
rename from server/mapobjectdb/postgres/sql.go
rename to mapobjectdb/postgres/sql.go
diff --git a/server/mapobjectdb/sqlite/logger.go b/mapobjectdb/sqlite/logger.go
similarity index 100%
rename from server/mapobjectdb/sqlite/logger.go
rename to mapobjectdb/sqlite/logger.go
diff --git a/server/mapobjectdb/sqlite/mapobjects.go b/mapobjectdb/sqlite/mapobjects.go
similarity index 100%
rename from server/mapobjectdb/sqlite/mapobjects.go
rename to mapobjectdb/sqlite/mapobjects.go
diff --git a/server/mapobjectdb/sqlite/mapobjects_test.go b/mapobjectdb/sqlite/mapobjects_test.go
similarity index 100%
rename from server/mapobjectdb/sqlite/mapobjects_test.go
rename to mapobjectdb/sqlite/mapobjects_test.go
diff --git a/server/mapobjectdb/sqlite/migrate.go b/mapobjectdb/sqlite/migrate.go
similarity index 100%
rename from server/mapobjectdb/sqlite/migrate.go
rename to mapobjectdb/sqlite/migrate.go
diff --git a/server/mapobjectdb/sqlite/new.go b/mapobjectdb/sqlite/new.go
similarity index 100%
rename from server/mapobjectdb/sqlite/new.go
rename to mapobjectdb/sqlite/new.go
diff --git a/server/mapobjectdb/sqlite/settings.go b/mapobjectdb/sqlite/settings.go
similarity index 100%
rename from server/mapobjectdb/sqlite/settings.go
rename to mapobjectdb/sqlite/settings.go
diff --git a/server/mapobjectdb/sqlite/sql.go b/mapobjectdb/sqlite/sql.go
similarity index 100%
rename from server/mapobjectdb/sqlite/sql.go
rename to mapobjectdb/sqlite/sql.go
diff --git a/server/params/params.go b/params/params.go
similarity index 100%
rename from server/params/params.go
rename to params/params.go
diff --git a/server/postgres_test/.gitignore b/postgres_test/.gitignore
similarity index 100%
rename from server/postgres_test/.gitignore
rename to postgres_test/.gitignore
diff --git a/server/postgres_test/docker-compose.yml b/postgres_test/docker-compose.yml
similarity index 100%
rename from server/postgres_test/docker-compose.yml
rename to postgres_test/docker-compose.yml
diff --git a/server/postgres_test/import.sh b/postgres_test/import.sh
similarity index 100%
rename from server/postgres_test/import.sh
rename to postgres_test/import.sh
diff --git a/server/postgres_test/minetest.postgres.sql b/postgres_test/minetest.postgres.sql
similarity index 100%
rename from server/postgres_test/minetest.postgres.sql
rename to postgres_test/minetest.postgres.sql
diff --git a/server/postgres_test/psql.sh b/postgres_test/psql.sh
similarity index 100%
rename from server/postgres_test/psql.sh
rename to postgres_test/psql.sh
diff --git a/server/postgres_test/world.postgres.mt b/postgres_test/world.postgres.mt
similarity index 100%
rename from server/postgres_test/world.postgres.mt
rename to postgres_test/world.postgres.mt
diff --git a/server/.gitignore b/server/.gitignore
deleted file mode 100644
index 49dd053..0000000
--- a/server/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-mapserver
-world.mt
-output
-test-output
-map.sqlite
-mapserver.tiles
-mapserver.sqlite
-mapserver.sqlite-journal
-mapserver.json
-debug.txt
diff --git a/server/Makefile b/server/Makefile
deleted file mode 100644
index a1194f1..0000000
--- a/server/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-STATIC_VFS=vfs/static.go
-OUT_DIR=output
-ENV=GO111MODULE=on
-VERSION=git-$(shell git rev-parse HEAD)
-
-
-# -ldflags="-X mapserver/app.Version=1.0"
-GO_LDFLAGS=-ldflags "-linkmode external -extldflags -static -X mapserver/app.Version=$(VERSION)"
-GO_LDFLAGS_WIN=-ldflags "-X mapserver/app.Version=$(VERSION)"
-GO_BUILD=CGO_ENABLED=1 go build
-
-BINARIES =  $(OUT_DIR)/mapserver-linux-x86_64
-BINARIES += $(OUT_DIR)/mapserver-linux-x86
-BINARIES += $(OUT_DIR)/mapserver-windows-x86.exe
-BINARIES += $(OUT_DIR)/mapserver-windows-x86-64.exe
-BINARIES += $(OUT_DIR)/mapserver-linux-arm
-
-$(OUT_DIR):
-	mkdir $@
-
-fmt:
-	go fmt ./...
-
-test: $(OUT_DIR)
-	go generate
-	go build
-	go vet ./...
-	$(ENV) go test ./...
-
-clean:
-	rm -rf $(STATIC_VFS) test-output
-	rm -rf $(OUT_DIR)
-
-jshint:
-	jshint static/js/*.js static/js/util static/js/overlays static/js/search
-
-$(STATIC_VFS):
-	go generate
-
-$(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)
-	# native (linux x86_64)
-	GOOS=linux GOARCH=amd64 CC=x86_64-linux-gnu-gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@
-
-$(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR)
-	# apt install gcc-8-i686-linux-gnu
-	GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc-7 $(GO_BUILD) $(GO_LDFLAGS) -o $@
-
-$(OUT_DIR)/mapserver-windows-x86.exe: $(OUT_DIR)
-	# apt install gcc-mingw-w64
-	GOARCH=386 GOOS=windows CC=i686-w64-mingw32-gcc $(GO_BUILD) $(GO_LDFLAGS_WIN) -o $@
-
-$(OUT_DIR)/mapserver-windows-x86-64.exe: $(OUT_DIR)
-	GOARCH=amd64 GOOS=windows CC=x86_64-w64-mingw32-gcc $(GO_BUILD) $(GO_LDFLAGS_WIN) -o $@
-
-$(OUT_DIR)/mapserver-linux-arm: $(OUT_DIR)
-	# apt install gcc-5-arm-linux-gnueabihf
-	GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-5 $(GO_BUILD) $(GO_LDFLAGS) -o $@
-
-all: $(STATIC_VFS) $(BINARIES)
diff --git a/server/settings/dbsettings.go b/settings/dbsettings.go
similarity index 100%
rename from server/settings/dbsettings.go
rename to settings/dbsettings.go
diff --git a/server/settings/settings.go b/settings/settings.go
similarity index 100%
rename from server/settings/settings.go
rename to settings/settings.go
diff --git a/server/settings/settings_test.go b/settings/settings_test.go
similarity index 100%
rename from server/settings/settings_test.go
rename to settings/settings_test.go
diff --git a/server/static/colors.txt b/static/colors.txt
similarity index 100%
rename from server/static/colors.txt
rename to static/colors.txt
diff --git a/server/static/css/bootstrap.min.css b/static/css/bootstrap.min.css
similarity index 100%
rename from server/static/css/bootstrap.min.css
rename to static/css/bootstrap.min.css
diff --git a/server/static/css/custom.css b/static/css/custom.css
similarity index 100%
rename from server/static/css/custom.css
rename to static/css/custom.css
diff --git a/server/static/css/fontawesome.min.css b/static/css/fontawesome.min.css
similarity index 100%
rename from server/static/css/fontawesome.min.css
rename to static/css/fontawesome.min.css
diff --git a/server/static/css/images/layers-2x.png b/static/css/images/layers-2x.png
similarity index 100%
rename from server/static/css/images/layers-2x.png
rename to static/css/images/layers-2x.png
diff --git a/server/static/css/images/layers.png b/static/css/images/layers.png
similarity index 100%
rename from server/static/css/images/layers.png
rename to static/css/images/layers.png
diff --git a/server/static/css/images/marker-icon-2x.png b/static/css/images/marker-icon-2x.png
similarity index 100%
rename from server/static/css/images/marker-icon-2x.png
rename to static/css/images/marker-icon-2x.png
diff --git a/server/static/css/images/marker-icon-green.png b/static/css/images/marker-icon-green.png
similarity index 100%
rename from server/static/css/images/marker-icon-green.png
rename to static/css/images/marker-icon-green.png
diff --git a/server/static/css/images/marker-icon-red.png b/static/css/images/marker-icon-red.png
similarity index 100%
rename from server/static/css/images/marker-icon-red.png
rename to static/css/images/marker-icon-red.png
diff --git a/server/static/css/images/marker-icon.png b/static/css/images/marker-icon.png
similarity index 100%
rename from server/static/css/images/marker-icon.png
rename to static/css/images/marker-icon.png
diff --git a/server/static/css/images/marker-shadow.png b/static/css/images/marker-shadow.png
similarity index 100%
rename from server/static/css/images/marker-shadow.png
rename to static/css/images/marker-shadow.png
diff --git a/server/static/css/images/markers-matte.png b/static/css/images/markers-matte.png
similarity index 100%
rename from server/static/css/images/markers-matte.png
rename to static/css/images/markers-matte.png
diff --git a/server/static/css/images/markers-matte@2x.png b/static/css/images/markers-matte@2x.png
similarity index 100%
rename from server/static/css/images/markers-matte@2x.png
rename to static/css/images/markers-matte@2x.png
diff --git a/server/static/css/images/markers-plain.png b/static/css/images/markers-plain.png
similarity index 100%
rename from server/static/css/images/markers-plain.png
rename to static/css/images/markers-plain.png
diff --git a/server/static/css/images/markers-shadow.png b/static/css/images/markers-shadow.png
similarity index 100%
rename from server/static/css/images/markers-shadow.png
rename to static/css/images/markers-shadow.png
diff --git a/server/static/css/images/markers-shadow@2x.png b/static/css/images/markers-shadow@2x.png
similarity index 100%
rename from server/static/css/images/markers-shadow@2x.png
rename to static/css/images/markers-shadow@2x.png
diff --git a/server/static/css/images/markers-soft.png b/static/css/images/markers-soft.png
similarity index 100%
rename from server/static/css/images/markers-soft.png
rename to static/css/images/markers-soft.png
diff --git a/server/static/css/images/markers-soft@2x.png b/static/css/images/markers-soft@2x.png
similarity index 100%
rename from server/static/css/images/markers-soft@2x.png
rename to static/css/images/markers-soft@2x.png
diff --git a/server/static/css/leaflet.awesome-markers.css b/static/css/leaflet.awesome-markers.css
similarity index 100%
rename from server/static/css/leaflet.awesome-markers.css
rename to static/css/leaflet.awesome-markers.css
diff --git a/server/static/css/leaflet.css b/static/css/leaflet.css
similarity index 100%
rename from server/static/css/leaflet.css
rename to static/css/leaflet.css
diff --git a/server/static/index.html b/static/index.html
similarity index 100%
rename from server/static/index.html
rename to static/index.html
diff --git a/server/static/js/.jshintrc b/static/js/.jshintrc
similarity index 100%
rename from server/static/js/.jshintrc
rename to static/js/.jshintrc
diff --git a/server/static/js/CoordinatesDisplay.js b/static/js/CoordinatesDisplay.js
similarity index 100%
rename from server/static/js/CoordinatesDisplay.js
rename to static/js/CoordinatesDisplay.js
diff --git a/server/static/js/Hashroute.js b/static/js/Hashroute.js
similarity index 100%
rename from server/static/js/Hashroute.js
rename to static/js/Hashroute.js
diff --git a/server/static/js/LayerManager.js b/static/js/LayerManager.js
similarity index 100%
rename from server/static/js/LayerManager.js
rename to static/js/LayerManager.js
diff --git a/server/static/js/Overlaysetup.js b/static/js/Overlaysetup.js
similarity index 100%
rename from server/static/js/Overlaysetup.js
rename to static/js/Overlaysetup.js
diff --git a/server/static/js/RealtimeTileLayer.js b/static/js/RealtimeTileLayer.js
similarity index 100%
rename from server/static/js/RealtimeTileLayer.js
rename to static/js/RealtimeTileLayer.js
diff --git a/server/static/js/SearchControl.js b/static/js/SearchControl.js
similarity index 100%
rename from server/static/js/SearchControl.js
rename to static/js/SearchControl.js
diff --git a/server/static/js/SimpleCRS.js b/static/js/SimpleCRS.js
similarity index 100%
rename from server/static/js/SimpleCRS.js
rename to static/js/SimpleCRS.js
diff --git a/server/static/js/WebSocketChannel.js b/static/js/WebSocketChannel.js
similarity index 100%
rename from server/static/js/WebSocketChannel.js
rename to static/js/WebSocketChannel.js
diff --git a/server/static/js/WorldInfoDisplay.js b/static/js/WorldInfoDisplay.js
similarity index 100%
rename from server/static/js/WorldInfoDisplay.js
rename to static/js/WorldInfoDisplay.js
diff --git a/server/static/js/api.js b/static/js/api.js
similarity index 100%
rename from server/static/js/api.js
rename to static/js/api.js
diff --git a/server/static/js/lib/color-hash.js b/static/js/lib/color-hash.js
similarity index 100%
rename from server/static/js/lib/color-hash.js
rename to static/js/lib/color-hash.js
diff --git a/server/static/js/lib/leaflet.awesome-markers.js b/static/js/lib/leaflet.awesome-markers.js
similarity index 100%
rename from server/static/js/lib/leaflet.awesome-markers.js
rename to static/js/lib/leaflet.awesome-markers.js
diff --git a/server/static/js/lib/leaflet.js b/static/js/lib/leaflet.js
similarity index 100%
rename from server/static/js/lib/leaflet.js
rename to static/js/lib/leaflet.js
diff --git a/server/static/js/lib/mithril.min.js b/static/js/lib/mithril.min.js
similarity index 100%
rename from server/static/js/lib/mithril.min.js
rename to static/js/lib/mithril.min.js
diff --git a/server/static/js/lib/moment.min.js b/static/js/lib/moment.min.js
similarity index 100%
rename from server/static/js/lib/moment.min.js
rename to static/js/lib/moment.min.js
diff --git a/server/static/js/main.js b/static/js/main.js
similarity index 100%
rename from server/static/js/main.js
rename to static/js/main.js
diff --git a/server/static/js/overlays/ATMOverlay.js b/static/js/overlays/ATMOverlay.js
similarity index 100%
rename from server/static/js/overlays/ATMOverlay.js
rename to static/js/overlays/ATMOverlay.js
diff --git a/server/static/js/overlays/AbstractGeoJsonOverlay.js b/static/js/overlays/AbstractGeoJsonOverlay.js
similarity index 100%
rename from server/static/js/overlays/AbstractGeoJsonOverlay.js
rename to static/js/overlays/AbstractGeoJsonOverlay.js
diff --git a/server/static/js/overlays/AbstractIconOverlay.js b/static/js/overlays/AbstractIconOverlay.js
similarity index 100%
rename from server/static/js/overlays/AbstractIconOverlay.js
rename to static/js/overlays/AbstractIconOverlay.js
diff --git a/server/static/js/overlays/BonesOverlay.js b/static/js/overlays/BonesOverlay.js
similarity index 100%
rename from server/static/js/overlays/BonesOverlay.js
rename to static/js/overlays/BonesOverlay.js
diff --git a/server/static/js/overlays/BorderOverlay.js b/static/js/overlays/BorderOverlay.js
similarity index 100%
rename from server/static/js/overlays/BorderOverlay.js
rename to static/js/overlays/BorderOverlay.js
diff --git a/server/static/js/overlays/DigitermOverlay.js b/static/js/overlays/DigitermOverlay.js
similarity index 100%
rename from server/static/js/overlays/DigitermOverlay.js
rename to static/js/overlays/DigitermOverlay.js
diff --git a/server/static/js/overlays/LabelOverlay.js b/static/js/overlays/LabelOverlay.js
similarity index 100%
rename from server/static/js/overlays/LabelOverlay.js
rename to static/js/overlays/LabelOverlay.js
diff --git a/server/static/js/overlays/LcdOverlay.js b/static/js/overlays/LcdOverlay.js
similarity index 100%
rename from server/static/js/overlays/LcdOverlay.js
rename to static/js/overlays/LcdOverlay.js
diff --git a/server/static/js/overlays/LocatorOverlay.js b/static/js/overlays/LocatorOverlay.js
similarity index 100%
rename from server/static/js/overlays/LocatorOverlay.js
rename to static/js/overlays/LocatorOverlay.js
diff --git a/server/static/js/overlays/LuacontrollerOverlay.js b/static/js/overlays/LuacontrollerOverlay.js
similarity index 100%
rename from server/static/js/overlays/LuacontrollerOverlay.js
rename to static/js/overlays/LuacontrollerOverlay.js
diff --git a/server/static/js/overlays/MinecartOverlay.js b/static/js/overlays/MinecartOverlay.js
similarity index 100%
rename from server/static/js/overlays/MinecartOverlay.js
rename to static/js/overlays/MinecartOverlay.js
diff --git a/server/static/js/overlays/MissionOverlay.js b/static/js/overlays/MissionOverlay.js
similarity index 100%
rename from server/static/js/overlays/MissionOverlay.js
rename to static/js/overlays/MissionOverlay.js
diff --git a/server/static/js/overlays/PlayerOverlay.js b/static/js/overlays/PlayerOverlay.js
similarity index 100%
rename from server/static/js/overlays/PlayerOverlay.js
rename to static/js/overlays/PlayerOverlay.js
diff --git a/server/static/js/overlays/PoiOverlay.js b/static/js/overlays/PoiOverlay.js
similarity index 100%
rename from server/static/js/overlays/PoiOverlay.js
rename to static/js/overlays/PoiOverlay.js
diff --git a/server/static/js/overlays/PrivProtectorOverlay.js b/static/js/overlays/PrivProtectorOverlay.js
similarity index 100%
rename from server/static/js/overlays/PrivProtectorOverlay.js
rename to static/js/overlays/PrivProtectorOverlay.js
diff --git a/server/static/js/overlays/ProtectorOverlay.js b/static/js/overlays/ProtectorOverlay.js
similarity index 100%
rename from server/static/js/overlays/ProtectorOverlay.js
rename to static/js/overlays/ProtectorOverlay.js
diff --git a/server/static/js/overlays/ShopOverlay.js b/static/js/overlays/ShopOverlay.js
similarity index 100%
rename from server/static/js/overlays/ShopOverlay.js
rename to static/js/overlays/ShopOverlay.js
diff --git a/server/static/js/overlays/TechnicAnchorOverlay.js b/static/js/overlays/TechnicAnchorOverlay.js
similarity index 100%
rename from server/static/js/overlays/TechnicAnchorOverlay.js
rename to static/js/overlays/TechnicAnchorOverlay.js
diff --git a/server/static/js/overlays/TechnicQuarryOverlay.js b/static/js/overlays/TechnicQuarryOverlay.js
similarity index 100%
rename from server/static/js/overlays/TechnicQuarryOverlay.js
rename to static/js/overlays/TechnicQuarryOverlay.js
diff --git a/server/static/js/overlays/TechnicSwitchOverlay.js b/static/js/overlays/TechnicSwitchOverlay.js
similarity index 100%
rename from server/static/js/overlays/TechnicSwitchOverlay.js
rename to static/js/overlays/TechnicSwitchOverlay.js
diff --git a/server/static/js/overlays/TrainOverlay.js b/static/js/overlays/TrainOverlay.js
similarity index 100%
rename from server/static/js/overlays/TrainOverlay.js
rename to static/js/overlays/TrainOverlay.js
diff --git a/server/static/js/overlays/TrainlineOverlay.js b/static/js/overlays/TrainlineOverlay.js
similarity index 100%
rename from server/static/js/overlays/TrainlineOverlay.js
rename to static/js/overlays/TrainlineOverlay.js
diff --git a/server/static/js/overlays/TravelnetOverlay.js b/static/js/overlays/TravelnetOverlay.js
similarity index 100%
rename from server/static/js/overlays/TravelnetOverlay.js
rename to static/js/overlays/TravelnetOverlay.js
diff --git a/server/static/js/overlays/XPProtectorOverlay.js b/static/js/overlays/XPProtectorOverlay.js
similarity index 100%
rename from server/static/js/overlays/XPProtectorOverlay.js
rename to static/js/overlays/XPProtectorOverlay.js
diff --git a/server/static/js/search/SearchInput.js b/static/js/search/SearchInput.js
similarity index 100%
rename from server/static/js/search/SearchInput.js
rename to static/js/search/SearchInput.js
diff --git a/server/static/js/search/SearchMenu.js b/static/js/search/SearchMenu.js
similarity index 100%
rename from server/static/js/search/SearchMenu.js
rename to static/js/search/SearchMenu.js
diff --git a/server/static/js/search/SearchResult.js b/static/js/search/SearchResult.js
similarity index 100%
rename from server/static/js/search/SearchResult.js
rename to static/js/search/SearchResult.js
diff --git a/server/static/js/search/SearchService.js b/static/js/search/SearchService.js
similarity index 100%
rename from server/static/js/search/SearchService.js
rename to static/js/search/SearchService.js
diff --git a/server/static/js/search/SearchStore.js b/static/js/search/SearchStore.js
similarity index 100%
rename from server/static/js/search/SearchStore.js
rename to static/js/search/SearchStore.js
diff --git a/server/static/js/util/debounce.js b/static/js/util/debounce.js
similarity index 100%
rename from server/static/js/util/debounce.js
rename to static/js/util/debounce.js
diff --git a/server/static/manifest.js b/static/manifest.js
similarity index 100%
rename from server/static/manifest.js
rename to static/manifest.js
diff --git a/server/static/pics/advtrains/advtrains_detailed_engine_steam_inv.png b/static/pics/advtrains/advtrains_detailed_engine_steam_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_detailed_engine_steam_inv.png
rename to static/pics/advtrains/advtrains_detailed_engine_steam_inv.png
diff --git a/server/static/pics/advtrains/advtrains_engine_industrial_inv.png b/static/pics/advtrains/advtrains_engine_industrial_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_engine_industrial_inv.png
rename to static/pics/advtrains/advtrains_engine_industrial_inv.png
diff --git a/server/static/pics/advtrains/advtrains_engine_japan_inv.png b/static/pics/advtrains/advtrains_engine_japan_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_engine_japan_inv.png
rename to static/pics/advtrains/advtrains_engine_japan_inv.png
diff --git a/server/static/pics/advtrains/advtrains_engine_steam_inv.png b/static/pics/advtrains/advtrains_engine_steam_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_engine_steam_inv.png
rename to static/pics/advtrains/advtrains_engine_steam_inv.png
diff --git a/server/static/pics/advtrains/advtrains_subway_wagon_inv.png b/static/pics/advtrains/advtrains_subway_wagon_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_subway_wagon_inv.png
rename to static/pics/advtrains/advtrains_subway_wagon_inv.png
diff --git a/server/static/pics/advtrains/advtrains_wagon_box_inv.png b/static/pics/advtrains/advtrains_wagon_box_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_wagon_box_inv.png
rename to static/pics/advtrains/advtrains_wagon_box_inv.png
diff --git a/server/static/pics/advtrains/advtrains_wagon_inv.png b/static/pics/advtrains/advtrains_wagon_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_wagon_inv.png
rename to static/pics/advtrains/advtrains_wagon_inv.png
diff --git a/server/static/pics/advtrains/advtrains_wagon_japan_inv.png b/static/pics/advtrains/advtrains_wagon_japan_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_wagon_japan_inv.png
rename to static/pics/advtrains/advtrains_wagon_japan_inv.png
diff --git a/server/static/pics/advtrains/advtrains_wagon_tank_inv.png b/static/pics/advtrains/advtrains_wagon_tank_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_wagon_tank_inv.png
rename to static/pics/advtrains/advtrains_wagon_tank_inv.png
diff --git a/server/static/pics/advtrains/advtrains_wagon_wood_inv.png b/static/pics/advtrains/advtrains_wagon_wood_inv.png
similarity index 100%
rename from server/static/pics/advtrains/advtrains_wagon_wood_inv.png
rename to static/pics/advtrains/advtrains_wagon_wood_inv.png
diff --git a/server/static/pics/advtrains_subway_wagon_inv_blue.png b/static/pics/advtrains_subway_wagon_inv_blue.png
similarity index 100%
rename from server/static/pics/advtrains_subway_wagon_inv_blue.png
rename to static/pics/advtrains_subway_wagon_inv_blue.png
diff --git a/server/static/pics/advtrains_subway_wagon_inv_green.png b/static/pics/advtrains_subway_wagon_inv_green.png
similarity index 100%
rename from server/static/pics/advtrains_subway_wagon_inv_green.png
rename to static/pics/advtrains_subway_wagon_inv_green.png
diff --git a/server/static/pics/advtrains_subway_wagon_inv_red.png b/static/pics/advtrains_subway_wagon_inv_red.png
similarity index 100%
rename from server/static/pics/advtrains_subway_wagon_inv_red.png
rename to static/pics/advtrains_subway_wagon_inv_red.png
diff --git a/server/static/pics/atm2_front.png b/static/pics/atm2_front.png
similarity index 100%
rename from server/static/pics/atm2_front.png
rename to static/pics/atm2_front.png
diff --git a/server/static/pics/atm3_front.png b/static/pics/atm3_front.png
similarity index 100%
rename from server/static/pics/atm3_front.png
rename to static/pics/atm3_front.png
diff --git a/server/static/pics/atm_front.png b/static/pics/atm_front.png
similarity index 100%
rename from server/static/pics/atm_front.png
rename to static/pics/atm_front.png
diff --git a/server/static/pics/atm_front_wt.png b/static/pics/atm_front_wt.png
similarity index 100%
rename from server/static/pics/atm_front_wt.png
rename to static/pics/atm_front_wt.png
diff --git a/server/static/pics/bones_top.png b/static/pics/bones_top.png
similarity index 100%
rename from server/static/pics/bones_top.png
rename to static/pics/bones_top.png
diff --git a/server/static/pics/bubble.png b/static/pics/bubble.png
similarity index 100%
rename from server/static/pics/bubble.png
rename to static/pics/bubble.png
diff --git a/server/static/pics/bubble_half.png b/static/pics/bubble_half.png
similarity index 100%
rename from server/static/pics/bubble_half.png
rename to static/pics/bubble_half.png
diff --git a/server/static/pics/default_tool_mesepick.png b/static/pics/default_tool_mesepick.png
similarity index 100%
rename from server/static/pics/default_tool_mesepick.png
rename to static/pics/default_tool_mesepick.png
diff --git a/server/static/pics/digiterms_beige_front.png b/static/pics/digiterms_beige_front.png
similarity index 100%
rename from server/static/pics/digiterms_beige_front.png
rename to static/pics/digiterms_beige_front.png
diff --git a/server/static/pics/heart.png b/static/pics/heart.png
similarity index 100%
rename from server/static/pics/heart.png
rename to static/pics/heart.png
diff --git a/server/static/pics/heart_half.png b/static/pics/heart_half.png
similarity index 100%
rename from server/static/pics/heart_half.png
rename to static/pics/heart_half.png
diff --git a/server/static/pics/jeija_luacontroller_burnt_top.png b/static/pics/jeija_luacontroller_burnt_top.png
similarity index 100%
rename from server/static/pics/jeija_luacontroller_burnt_top.png
rename to static/pics/jeija_luacontroller_burnt_top.png
diff --git a/server/static/pics/jeija_luacontroller_top.png b/static/pics/jeija_luacontroller_top.png
similarity index 100%
rename from server/static/pics/jeija_luacontroller_top.png
rename to static/pics/jeija_luacontroller_top.png
diff --git a/server/static/pics/lcd_lcd.png b/static/pics/lcd_lcd.png
similarity index 100%
rename from server/static/pics/lcd_lcd.png
rename to static/pics/lcd_lcd.png
diff --git a/server/static/pics/locator_beacon_base.png b/static/pics/locator_beacon_base.png
similarity index 100%
rename from server/static/pics/locator_beacon_base.png
rename to static/pics/locator_beacon_base.png
diff --git a/server/static/pics/locator_beacon_level1.png b/static/pics/locator_beacon_level1.png
similarity index 100%
rename from server/static/pics/locator_beacon_level1.png
rename to static/pics/locator_beacon_level1.png
diff --git a/server/static/pics/locator_beacon_level2.png b/static/pics/locator_beacon_level2.png
similarity index 100%
rename from server/static/pics/locator_beacon_level2.png
rename to static/pics/locator_beacon_level2.png
diff --git a/server/static/pics/locator_beacon_level3.png b/static/pics/locator_beacon_level3.png
similarity index 100%
rename from server/static/pics/locator_beacon_level3.png
rename to static/pics/locator_beacon_level3.png
diff --git a/server/static/pics/locator_radar.png b/static/pics/locator_radar.png
similarity index 100%
rename from server/static/pics/locator_radar.png
rename to static/pics/locator_radar.png
diff --git a/server/static/pics/mapserver_label.png b/static/pics/mapserver_label.png
similarity index 100%
rename from server/static/pics/mapserver_label.png
rename to static/pics/mapserver_label.png
diff --git a/server/static/pics/minecart_logo.png b/static/pics/minecart_logo.png
similarity index 100%
rename from server/static/pics/minecart_logo.png
rename to static/pics/minecart_logo.png
diff --git a/server/static/pics/mission_32px.png b/static/pics/mission_32px.png
similarity index 100%
rename from server/static/pics/mission_32px.png
rename to static/pics/mission_32px.png
diff --git a/server/static/pics/mission_64px.png b/static/pics/mission_64px.png
similarity index 100%
rename from server/static/pics/mission_64px.png
rename to static/pics/mission_64px.png
diff --git a/server/static/pics/sam.png b/static/pics/sam.png
similarity index 100%
rename from server/static/pics/sam.png
rename to static/pics/sam.png
diff --git a/server/static/pics/search.png b/static/pics/search.png
similarity index 100%
rename from server/static/pics/search.png
rename to static/pics/search.png
diff --git a/server/static/pics/shop.png b/static/pics/shop.png
similarity index 100%
rename from server/static/pics/shop.png
rename to static/pics/shop.png
diff --git a/server/static/pics/shop_empty.png b/static/pics/shop_empty.png
similarity index 100%
rename from server/static/pics/shop_empty.png
rename to static/pics/shop_empty.png
diff --git a/server/static/pics/technic_admin_anchor.png b/static/pics/technic_admin_anchor.png
similarity index 100%
rename from server/static/pics/technic_admin_anchor.png
rename to static/pics/technic_admin_anchor.png
diff --git a/server/static/pics/technic_hv_nuclear_reactor_core.png b/static/pics/technic_hv_nuclear_reactor_core.png
similarity index 100%
rename from server/static/pics/technic_hv_nuclear_reactor_core.png
rename to static/pics/technic_hv_nuclear_reactor_core.png
diff --git a/server/static/pics/technic_water_mill_top_active.png b/static/pics/technic_water_mill_top_active.png
similarity index 100%
rename from server/static/pics/technic_water_mill_top_active.png
rename to static/pics/technic_water_mill_top_active.png
diff --git a/server/static/pics/travelnet_inv.png b/static/pics/travelnet_inv.png
similarity index 100%
rename from server/static/pics/travelnet_inv.png
rename to static/pics/travelnet_inv.png
diff --git a/server/static/sql/postgres_mapdb_migrate.sql b/static/sql/postgres_mapdb_migrate.sql
similarity index 100%
rename from server/static/sql/postgres_mapdb_migrate.sql
rename to static/sql/postgres_mapdb_migrate.sql
diff --git a/server/static/sql/postgres_mapobjectdb_migrate.sql b/static/sql/postgres_mapobjectdb_migrate.sql
similarity index 100%
rename from server/static/sql/postgres_mapobjectdb_migrate.sql
rename to static/sql/postgres_mapobjectdb_migrate.sql
diff --git a/server/static/sql/sqlite_mapdb_migrate.sql b/static/sql/sqlite_mapdb_migrate.sql
similarity index 100%
rename from server/static/sql/sqlite_mapdb_migrate.sql
rename to static/sql/sqlite_mapdb_migrate.sql
diff --git a/server/static/sql/sqlite_mapobjectdb_migrate.sql b/static/sql/sqlite_mapobjectdb_migrate.sql
similarity index 100%
rename from server/static/sql/sqlite_mapobjectdb_migrate.sql
rename to static/sql/sqlite_mapobjectdb_migrate.sql
diff --git a/server/static/webfonts/fa-brands-400.eot b/static/webfonts/fa-brands-400.eot
similarity index 100%
rename from server/static/webfonts/fa-brands-400.eot
rename to static/webfonts/fa-brands-400.eot
diff --git a/server/static/webfonts/fa-brands-400.svg b/static/webfonts/fa-brands-400.svg
similarity index 100%
rename from server/static/webfonts/fa-brands-400.svg
rename to static/webfonts/fa-brands-400.svg
diff --git a/server/static/webfonts/fa-brands-400.ttf b/static/webfonts/fa-brands-400.ttf
similarity index 100%
rename from server/static/webfonts/fa-brands-400.ttf
rename to static/webfonts/fa-brands-400.ttf
diff --git a/server/static/webfonts/fa-brands-400.woff b/static/webfonts/fa-brands-400.woff
similarity index 100%
rename from server/static/webfonts/fa-brands-400.woff
rename to static/webfonts/fa-brands-400.woff
diff --git a/server/static/webfonts/fa-brands-400.woff2 b/static/webfonts/fa-brands-400.woff2
similarity index 100%
rename from server/static/webfonts/fa-brands-400.woff2
rename to static/webfonts/fa-brands-400.woff2
diff --git a/server/static/webfonts/fa-regular-400.eot b/static/webfonts/fa-regular-400.eot
similarity index 100%
rename from server/static/webfonts/fa-regular-400.eot
rename to static/webfonts/fa-regular-400.eot
diff --git a/server/static/webfonts/fa-regular-400.svg b/static/webfonts/fa-regular-400.svg
similarity index 100%
rename from server/static/webfonts/fa-regular-400.svg
rename to static/webfonts/fa-regular-400.svg
diff --git a/server/static/webfonts/fa-regular-400.ttf b/static/webfonts/fa-regular-400.ttf
similarity index 100%
rename from server/static/webfonts/fa-regular-400.ttf
rename to static/webfonts/fa-regular-400.ttf
diff --git a/server/static/webfonts/fa-regular-400.woff b/static/webfonts/fa-regular-400.woff
similarity index 100%
rename from server/static/webfonts/fa-regular-400.woff
rename to static/webfonts/fa-regular-400.woff
diff --git a/server/static/webfonts/fa-regular-400.woff2 b/static/webfonts/fa-regular-400.woff2
similarity index 100%
rename from server/static/webfonts/fa-regular-400.woff2
rename to static/webfonts/fa-regular-400.woff2
diff --git a/server/static/webfonts/fa-solid-900.eot b/static/webfonts/fa-solid-900.eot
similarity index 100%
rename from server/static/webfonts/fa-solid-900.eot
rename to static/webfonts/fa-solid-900.eot
diff --git a/server/static/webfonts/fa-solid-900.svg b/static/webfonts/fa-solid-900.svg
similarity index 100%
rename from server/static/webfonts/fa-solid-900.svg
rename to static/webfonts/fa-solid-900.svg
diff --git a/server/static/webfonts/fa-solid-900.ttf b/static/webfonts/fa-solid-900.ttf
similarity index 100%
rename from server/static/webfonts/fa-solid-900.ttf
rename to static/webfonts/fa-solid-900.ttf
diff --git a/server/static/webfonts/fa-solid-900.woff b/static/webfonts/fa-solid-900.woff
similarity index 100%
rename from server/static/webfonts/fa-solid-900.woff
rename to static/webfonts/fa-solid-900.woff
diff --git a/server/static/webfonts/fa-solid-900.woff2 b/static/webfonts/fa-solid-900.woff2
similarity index 100%
rename from server/static/webfonts/fa-solid-900.woff2
rename to static/webfonts/fa-solid-900.woff2
diff --git a/server/testutils/database.go b/testutils/database.go
similarity index 100%
rename from server/testutils/database.go
rename to testutils/database.go
diff --git a/server/testutils/testdata/map1.sqlite b/testutils/testdata/map1.sqlite
similarity index 100%
rename from server/testutils/testdata/map1.sqlite
rename to testutils/testdata/map1.sqlite
diff --git a/server/testutils/testdata/map2.sqlite b/testutils/testdata/map2.sqlite
similarity index 100%
rename from server/testutils/testdata/map2.sqlite
rename to testutils/testdata/map2.sqlite
diff --git a/server/tiledb/logger.go b/tiledb/logger.go
similarity index 100%
rename from server/tiledb/logger.go
rename to tiledb/logger.go
diff --git a/server/tiledb/prometheus.go b/tiledb/prometheus.go
similarity index 100%
rename from server/tiledb/prometheus.go
rename to tiledb/prometheus.go
diff --git a/server/tiledb/tiledb.go b/tiledb/tiledb.go
similarity index 100%
rename from server/tiledb/tiledb.go
rename to tiledb/tiledb.go
diff --git a/server/tiledb/tiledb_test.go b/tiledb/tiledb_test.go
similarity index 100%
rename from server/tiledb/tiledb_test.go
rename to tiledb/tiledb_test.go
diff --git a/server/tilerenderer/blank.go b/tilerenderer/blank.go
similarity index 100%
rename from server/tilerenderer/blank.go
rename to tilerenderer/blank.go
diff --git a/server/tilerenderer/logger.go b/tilerenderer/logger.go
similarity index 100%
rename from server/tilerenderer/logger.go
rename to tilerenderer/logger.go
diff --git a/server/tilerenderer/prometheus.go b/tilerenderer/prometheus.go
similarity index 100%
rename from server/tilerenderer/prometheus.go
rename to tilerenderer/prometheus.go
diff --git a/server/tilerenderer/renderer.go b/tilerenderer/renderer.go
similarity index 100%
rename from server/tilerenderer/renderer.go
rename to tilerenderer/renderer.go
diff --git a/server/tilerenderer/renderer_test.go b/tilerenderer/renderer_test.go
similarity index 100%
rename from server/tilerenderer/renderer_test.go
rename to tilerenderer/renderer_test.go
diff --git a/server/tilerendererjob/common.go b/tilerendererjob/common.go
similarity index 100%
rename from server/tilerendererjob/common.go
rename to tilerendererjob/common.go
diff --git a/server/tilerendererjob/incremental.go b/tilerendererjob/incremental.go
similarity index 100%
rename from server/tilerendererjob/incremental.go
rename to tilerendererjob/incremental.go
diff --git a/server/tilerendererjob/initial.go b/tilerendererjob/initial.go
similarity index 100%
rename from server/tilerendererjob/initial.go
rename to tilerendererjob/initial.go
diff --git a/server/tilerendererjob/job.go b/tilerendererjob/job.go
similarity index 100%
rename from server/tilerendererjob/job.go
rename to tilerendererjob/job.go
diff --git a/server/tilerendererjob/metrics.go b/tilerendererjob/metrics.go
similarity index 100%
rename from server/tilerendererjob/metrics.go
rename to tilerendererjob/metrics.go
diff --git a/server/tilerendererjob/worker.go b/tilerendererjob/worker.go
similarity index 100%
rename from server/tilerendererjob/worker.go
rename to tilerendererjob/worker.go
diff --git a/server/travelnetparser/parser.go b/travelnetparser/parser.go
similarity index 100%
rename from server/travelnetparser/parser.go
rename to travelnetparser/parser.go
diff --git a/server/travelnetparser/parser_test.go b/travelnetparser/parser_test.go
similarity index 100%
rename from server/travelnetparser/parser_test.go
rename to travelnetparser/parser_test.go
diff --git a/server/travelnetparser/testdata/mod_travelnet.data b/travelnetparser/testdata/mod_travelnet.data
similarity index 100%
rename from server/travelnetparser/testdata/mod_travelnet.data
rename to travelnetparser/testdata/mod_travelnet.data
diff --git a/server/vfs/.gitignore b/vfs/.gitignore
similarity index 100%
rename from server/vfs/.gitignore
rename to vfs/.gitignore
diff --git a/server/web/areas.go b/web/areas.go
similarity index 100%
rename from server/web/areas.go
rename to web/areas.go
diff --git a/server/web/config.go b/web/config.go
similarity index 100%
rename from server/web/config.go
rename to web/config.go
diff --git a/server/web/logger.go b/web/logger.go
similarity index 100%
rename from server/web/logger.go
rename to web/logger.go
diff --git a/server/web/mapblock.go b/web/mapblock.go
similarity index 100%
rename from server/web/mapblock.go
rename to web/mapblock.go
diff --git a/server/web/mapobjects.go b/web/mapobjects.go
similarity index 100%
rename from server/web/mapobjects.go
rename to web/mapobjects.go
diff --git a/server/web/minetest.go b/web/minetest.go
similarity index 100%
rename from server/web/minetest.go
rename to web/minetest.go
diff --git a/server/web/prometheus.go b/web/prometheus.go
similarity index 100%
rename from server/web/prometheus.go
rename to web/prometheus.go
diff --git a/server/web/serve.go b/web/serve.go
similarity index 100%
rename from server/web/serve.go
rename to web/serve.go
diff --git a/server/web/tiles.go b/web/tiles.go
similarity index 100%
rename from server/web/tiles.go
rename to web/tiles.go
diff --git a/server/web/ws.go b/web/ws.go
similarity index 100%
rename from server/web/ws.go
rename to web/ws.go
diff --git a/server/worldconfig/parse.go b/worldconfig/parse.go
similarity index 100%
rename from server/worldconfig/parse.go
rename to worldconfig/parse.go
diff --git a/server/worldconfig/parse_test.go b/worldconfig/parse_test.go
similarity index 100%
rename from server/worldconfig/parse_test.go
rename to worldconfig/parse_test.go
diff --git a/server/worldconfig/testdata/world.mt.postgres b/worldconfig/testdata/world.mt.postgres
similarity index 100%
rename from server/worldconfig/testdata/world.mt.postgres
rename to worldconfig/testdata/world.mt.postgres
diff --git a/server/worldconfig/testdata/world.mt.sqlite b/worldconfig/testdata/world.mt.sqlite
similarity index 100%
rename from server/worldconfig/testdata/world.mt.sqlite
rename to worldconfig/testdata/world.mt.sqlite