diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9adee07..988da82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Moved all API routes under `/v1` namespace
+* Server port can now be configured
 
 ## [0.3.0](https://git.rustybever.be/vieter/vieter/src/tag/0.3.0)
 
diff --git a/src/client/targets.v b/src/client/targets.v
index 86d8c2a..ab846ce 100644
--- a/src/client/targets.v
+++ b/src/client/targets.v
@@ -12,7 +12,7 @@ pub fn (c &Client) get_targets(filter TargetFilter) ?[]Target {
 	return data.data
 }
 
-// get_all_targets retrieves *all* targs from the API using the default
+// get_all_targets retrieves *all* targets from the API using the default
 // limit.
 pub fn (c &Client) get_all_targets() ?[]Target {
 	mut targets := []Target{}
diff --git a/src/archive.c.v b/src/package/archive.c.v
similarity index 99%
rename from src/archive.c.v
rename to src/package/archive.c.v
index 1f0d1dd..d8fccd2 100644
--- a/src/archive.c.v
+++ b/src/package/archive.c.v
@@ -1,4 +1,5 @@
 // Bindings for the libarchive library
+module package
 
 #flag -larchive
 
diff --git a/src/server/api_targets_test.v b/src/server/api_targets_test.v
new file mode 100644
index 0000000..24a1851
--- /dev/null
+++ b/src/server/api_targets_test.v
@@ -0,0 +1,17 @@
+module server
+
+import io.util
+import os
+
+fn test_targets_api() ? {
+	// Create a database
+
+	// Start the server in a temporary directory
+	tmpdir := util.temp_dir()?
+	go server.server(
+		data_dir: tmpdir
+		pkg_dir: os.join_path_single(tmpdir, 'pkgs')
+		api_key: 't'
+		port: 9000
+	)
+}
diff --git a/src/server/cli.v b/src/server/cli.v
index 556efcf..ca60ec5 100644
--- a/src/server/cli.v
+++ b/src/server/cli.v
@@ -10,6 +10,7 @@ pub:
 	data_dir     string
 	api_key      string
 	default_arch string
+	port int = 8000
 }
 
 // cmd returns the cli submodule that handles starting the server
diff --git a/src/server/server.v b/src/server/server.v
index 2309ee7..1a9df3f 100644
--- a/src/server/server.v
+++ b/src/server/server.v
@@ -8,7 +8,6 @@ import util
 import db
 
 const (
-	port          = 8000
 	log_file_name = 'vieter.log'
 	repo_dir_name = 'repos'
 	db_file_name  = 'vieter.sqlite'
@@ -77,5 +76,5 @@ pub fn server(conf Config) ? {
 		conf: conf
 		repo: repo
 		db: db
-	}, server.port)
+	}, conf.port)
 }