diff --git a/middleware/util_recorder.go b/middleware/recorder.go
similarity index 100%
rename from middleware/util_recorder.go
rename to middleware/recorder.go
diff --git a/middleware/util_replacer.go b/middleware/replacer.go
similarity index 97%
rename from middleware/util_replacer.go
rename to middleware/replacer.go
index b7369abc..a8ed289b 100644
--- a/middleware/util_replacer.go
+++ b/middleware/replacer.go
@@ -60,7 +60,7 @@ func NewReplacer(r *http.Request, rw *responseRecorder) replacer {
 	return rep
 }
 
-// replace performs a replacement of values on s and returns
+// Replace performs a replacement of values on s and returns
 // the string with the replaced values.
 func (r replacer) Replace(s string) string {
 	for placeholder, replacement := range r {
diff --git a/server/server.go b/server/server.go
index a12d91eb..29d8584f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,3 +1,7 @@
+// Server implements a configurable, general-purpose web server. It
+// relies on configurations obtained from the adjacent config package
+// and can execute middleware as defined by the adjacent middleware
+// package.
 package server
 
 import (