Extract the handler in locals3/main.go as localbucket.Handler(root string) http.Handler. The root and the mutex move into the closure, so the package has no mutable package-level state. locals3 keeps its flags and calls localbucket.Handler; its build path and the site-test fixtures do not change. The existing locals3 handler tests move to localbucket.