diff --git a/components/api/src/main/java/com/hotels/styx/api/FullHttpResponse.java b/components/api/src/main/java/com/hotels/styx/api/FullHttpResponse.java
index fd171f5c66..8eb3a4a145 100644
--- a/components/api/src/main/java/com/hotels/styx/api/FullHttpResponse.java
+++ b/components/api/src/main/java/com/hotels/styx/api/FullHttpResponse.java
@@ -17,7 +17,6 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.net.MediaType;
 import com.hotels.styx.api.cookies.ResponseCookie;
 import com.hotels.styx.api.messages.HttpResponseStatus;
 import com.hotels.styx.api.messages.HttpVersion;
@@ -33,7 +32,6 @@
 import static com.google.common.base.Objects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.hotels.styx.api.HttpHeaderNames.CONTENT_LENGTH;
-import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.HttpHeaderNames.SET_COOKIE;
 import static com.hotels.styx.api.HttpHeaderNames.TRANSFER_ENCODING;
 import static com.hotels.styx.api.HttpHeaderValues.CHUNKED;
@@ -458,10 +456,6 @@ public Builder addHeader(CharSequence name, Object value) {
             return this;
         }
 
-        public Builder contentType(MediaType mediaType) {
-            return addHeader(CONTENT_TYPE, mediaType);
-        }
-
         /**
          * Removes the header with the specified name.
          *
diff --git a/components/api/src/main/java/com/hotels/styx/api/HttpResponse.java b/components/api/src/main/java/com/hotels/styx/api/HttpResponse.java
index e804111ade..47b685a700 100644
--- a/components/api/src/main/java/com/hotels/styx/api/HttpResponse.java
+++ b/components/api/src/main/java/com/hotels/styx/api/HttpResponse.java
@@ -17,7 +17,6 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.net.MediaType;
 import com.hotels.styx.api.cookies.ResponseCookie;
 import com.hotels.styx.api.messages.HttpResponseStatus;
 import com.hotels.styx.api.messages.HttpVersion;
@@ -37,7 +36,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.hotels.styx.api.FlowControlDisableOperator.disableFlowControl;
 import static com.hotels.styx.api.HttpHeaderNames.CONTENT_LENGTH;
-import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.HttpHeaderNames.SET_COOKIE;
 import static com.hotels.styx.api.HttpHeaderNames.TRANSFER_ENCODING;
 import static com.hotels.styx.api.HttpHeaderValues.CHUNKED;
@@ -445,10 +443,6 @@ public Builder addHeader(CharSequence name, Object value) {
             return this;
         }
 
-        public Builder contentType(MediaType mediaType) {
-            return addHeader(CONTENT_TYPE, mediaType);
-        }
-
         /**
          * Removes the header with the specified name.
          *
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/HealthCheckHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/HealthCheckHandler.java
index 3483dfc0c2..d85475a2a9 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/HealthCheckHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/HealthCheckHandler.java
@@ -23,11 +23,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.hotels.styx.api.FullHttpResponse;
 import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
-import com.hotels.styx.common.http.handler.BaseHttpHandler;
 import com.hotels.styx.api.messages.HttpResponseStatus;
+import com.hotels.styx.common.http.handler.BaseHttpHandler;
 
 import java.util.Map;
 import java.util.SortedMap;
@@ -35,6 +34,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.net.MediaType.JSON_UTF_8;
+import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.INTERNAL_SERVER_ERROR;
 import static com.hotels.styx.api.messages.HttpResponseStatus.NOT_IMPLEMENTED;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
@@ -73,9 +74,9 @@ private static ObjectMapper mapper() {
     @Override
     protected HttpResponse doHandle(HttpRequest request) {
         SortedMap<String, HealthCheck.Result> results = runHealthChecks();
-        return FullHttpResponse.response(responseStatus(results))
+        return response(responseStatus(results))
                 .disableCaching()
-                .contentType(JSON_UTF_8)
+                .addHeader(CONTENT_TYPE, JSON_UTF_8.toString())
                 .body(body(request, results), UTF_8)
                 .build()
                 .toStreamingResponse();
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/IndexHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/IndexHandler.java
index 08616413e0..4d46d3a11b 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/IndexHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/IndexHandler.java
@@ -15,14 +15,15 @@
  */
 package com.hotels.styx.admin.handlers;
 
-import com.hotels.styx.api.FullHttpResponse;
+import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.common.http.handler.BaseHttpHandler;
-import com.hotels.styx.api.HttpRequest;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.net.HttpHeaders.CONTENT_LANGUAGE;
 import static com.google.common.net.MediaType.HTML_UTF_8;
+import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -56,8 +57,8 @@ private static String generateHtml(Iterable<Link> links) {
 
     @Override
     protected HttpResponse doHandle(HttpRequest request) {
-        return FullHttpResponse.response(OK)
-                .contentType(HTML_UTF_8)
+        return response(OK)
+                .addHeader(CONTENT_TYPE, HTML_UTF_8.toString())
                 .header(CONTENT_LANGUAGE, "en")
                 .body(html, UTF_8)
                 .build()
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/JsonHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/JsonHandler.java
index 96ec33baef..1a46b6e337 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/JsonHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/JsonHandler.java
@@ -21,6 +21,7 @@
 import com.hotels.styx.admin.dashboard.JsonSupplier;
 import com.hotels.styx.admin.handlers.json.JsonReformatter;
 import com.hotels.styx.api.Clock;
+import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.common.http.handler.BaseHttpHandler;
 import org.slf4j.Logger;
@@ -32,11 +33,11 @@
 import static com.google.common.net.MediaType.JSON_UTF_8;
 import static com.hotels.styx.api.Clocks.systemClock;
 import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.INTERNAL_SERVER_ERROR;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.slf4j.LoggerFactory.getLogger;
-import com.hotels.styx.api.HttpRequest;
 
 /**
  * Handler for returning JSON. If a cache expiration value is present, the JSON is not regenerated on every call, unless
@@ -93,7 +94,7 @@ protected HttpResponse doHandle(HttpRequest request) {
 
             return response(OK)
                     .disableCaching()
-                    .contentType(JSON_UTF_8)
+                    .addHeader(CONTENT_TYPE, JSON_UTF_8.toString())
                     .body(jsonContent, UTF_8)
                     .build()
                     .toStreamingResponse();
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsHandler.java
index de4fdaaf4c..18d094b702 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsHandler.java
@@ -18,20 +18,21 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
-import com.hotels.styx.common.http.handler.BaseHttpHandler;
 import com.hotels.styx.api.service.BackendService;
 import com.hotels.styx.api.service.spi.Registry;
+import com.hotels.styx.common.http.handler.BaseHttpHandler;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.net.MediaType.JSON_UTF_8;
-import static com.hotels.styx.infrastructure.configuration.json.ObjectMappers.addStyxMixins;
 import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.INTERNAL_SERVER_ERROR;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
+import static com.hotels.styx.infrastructure.configuration.json.ObjectMappers.addStyxMixins;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import com.hotels.styx.api.HttpRequest;
 
 /**
  * Provides origins configuration in the form of JSON.
@@ -57,7 +58,7 @@ private HttpResponse jsonResponse(Object object, boolean prettyPrint) {
             String jsonContent = marshal(object, prettyPrint);
             return response(OK)
                     .disableCaching()
-                    .contentType(JSON_UTF_8)
+                    .addHeader(CONTENT_TYPE, JSON_UTF_8.toString())
                     .body(jsonContent, UTF_8)
                     .build()
                     .toStreamingResponse();
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsInventoryHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsInventoryHandler.java
index 1eff0f7b5f..819fe95c1a 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsInventoryHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/OriginsInventoryHandler.java
@@ -20,13 +20,13 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import com.hotels.styx.api.FullHttpResponse;
+import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.api.Id;
 import com.hotels.styx.api.client.OriginsChangeListener;
 import com.hotels.styx.api.client.OriginsSnapshot;
-import com.hotels.styx.common.http.handler.BaseHttpHandler;
 import com.hotels.styx.client.origincommands.GetOriginsInventorySnapshot;
+import com.hotels.styx.common.http.handler.BaseHttpHandler;
 import org.slf4j.Logger;
 
 import java.util.Map;
@@ -35,11 +35,12 @@
 import static com.fasterxml.jackson.databind.SerializationFeature.FAIL_ON_EMPTY_BEANS;
 import static com.google.common.net.MediaType.JSON_UTF_8;
 import static com.hotels.styx.admin.support.Json.PRETTY_PRINTER;
-import static com.hotels.styx.infrastructure.configuration.json.ObjectMappers.addStyxMixins;
+import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
+import static com.hotels.styx.infrastructure.configuration.json.ObjectMappers.addStyxMixins;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.slf4j.LoggerFactory.getLogger;
-import com.hotels.styx.api.HttpRequest;
 
 /**
  * Returns an origins inventory snapshot in an HTTP response.
@@ -64,8 +65,8 @@ public OriginsInventoryHandler(EventBus eventBus) {
 
     @Override
     protected HttpResponse doHandle(HttpRequest request) {
-        return FullHttpResponse.response(OK)
-                .contentType(JSON_UTF_8)
+        return response(OK)
+                .addHeader(CONTENT_TYPE, JSON_UTF_8.toString())
                 .disableCaching()
                 .body(content(isPrettyPrint(request)), UTF_8)
                 .build()
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PingHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PingHandler.java
index 5a158fffda..b167cd9424 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PingHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PingHandler.java
@@ -15,14 +15,15 @@
  */
 package com.hotels.styx.admin.handlers;
 
+import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.common.http.handler.BaseHttpHandler;
 
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import com.hotels.styx.api.HttpRequest;
 
 /**
  * A simple handler that can confirm that the admin interface is available. Returns a non-caching plain-text response
@@ -33,7 +34,7 @@ public class PingHandler extends BaseHttpHandler {
     protected HttpResponse doHandle(HttpRequest request) {
         return response(OK)
                 .disableCaching()
-                .contentType(PLAIN_TEXT_UTF_8)
+                .addHeader(CONTENT_TYPE, PLAIN_TEXT_UTF_8.toString())
                 .body("pong", UTF_8)
                 .build()
                 .toStreamingResponse();
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginListHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginListHandler.java
index 3fb7df2eae..89ac5cd45d 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginListHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginListHandler.java
@@ -15,9 +15,9 @@
  */
 package com.hotels.styx.admin.handlers;
 
-import com.hotels.styx.api.FullHttpResponse;
 import com.hotels.styx.api.HttpHandler;
 import com.hotels.styx.api.HttpInterceptor;
+import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.api.StyxObservable;
 import com.hotels.styx.proxy.plugin.NamedPlugin;
@@ -26,13 +26,14 @@
 import java.util.stream.Stream;
 
 import static com.google.common.net.MediaType.HTML_UTF_8;
+import static com.hotels.styx.api.FullHttpResponse.response;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;
-import com.hotels.styx.api.HttpRequest;
 
 /**
  * Returns a simple HTML page with a list of plugins, split into enabled and disabled.
@@ -52,9 +53,9 @@ public StyxObservable<HttpResponse> handle(HttpRequest request, HttpInterceptor.
         String output = section("Enabled", enabled)
                 + section("Disabled", disabled);
 
-        return StyxObservable.of(FullHttpResponse.response(OK)
+        return StyxObservable.of(response(OK)
                 .body(output, UTF_8)
-                .contentType(HTML_UTF_8)
+                .addHeader(CONTENT_TYPE, HTML_UTF_8.toString())
                 .build()
                 .toStreamingResponse());
     }
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginToggleHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginToggleHandler.java
index 099dcdf991..2860f875df 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginToggleHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PluginToggleHandler.java
@@ -35,6 +35,7 @@
 
 import static com.google.common.base.Throwables.propagate;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.HttpResponse.response;
 import static com.hotels.styx.api.messages.HttpResponseStatus.BAD_REQUEST;
 import static com.hotels.styx.api.messages.HttpResponseStatus.INTERNAL_SERVER_ERROR;
@@ -172,10 +173,10 @@ private static StyxObservable<PluginEnabledState> requestedNewState(HttpRequest
                 .map(PluginEnabledState::fromBoolean);
     }
 
-    private HttpResponse responseWith(HttpResponseStatus status, String message) {
+    private static HttpResponse responseWith(HttpResponseStatus status, String message) {
         return FullHttpResponse.response(status)
                 .body(message + "\n", UTF_8)
-                .contentType(PLAIN_TEXT_UTF_8)
+                .addHeader(CONTENT_TYPE, PLAIN_TEXT_UTF_8.toString())
                 .disableCaching()
                 .build()
                 .toStreamingResponse();
@@ -192,7 +193,7 @@ private static boolean parseToBoolean(String string) {
         }
     }
 
-    private StyxObservable<HttpResponse> handleErrors(Throwable e, HttpInterceptor.Context context) {
+    private static StyxObservable<HttpResponse> handleErrors(Throwable e, HttpInterceptor.Context context) {
         if (e instanceof PluginNotFoundException) {
             return StyxObservable.of(responseWith(NOT_FOUND, e.getMessage()));
         }
diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/StatusHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/StatusHandler.java
index e118bb1506..7e62dd62c2 100644
--- a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/StatusHandler.java
+++ b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/StatusHandler.java
@@ -25,6 +25,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
+import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -47,11 +48,10 @@ public StatusHandler(HttpHandler handler) {
     public StyxObservable<HttpResponse> handle(HttpRequest request, HttpInterceptor.Context context) {
         return handler.handle(request, context)
                 .flatMap(response -> response.toFullResponse(0xffffff))
-                .map(response ->
-                        response.newBuilder()
-                                .contentType(PLAIN_TEXT_UTF_8)
-                                .body(statusContent(response.status()), UTF_8)
-                                .build())
+                .map(response -> response.newBuilder()
+                        .addHeader(CONTENT_TYPE, PLAIN_TEXT_UTF_8.toString())
+                        .body(statusContent(response.status()), UTF_8)
+                        .build())
                 .map(FullHttpResponse::toStreamingResponse);
     }
 
diff --git a/components/server/src/main/java/com/hotels/styx/server/handlers/ClassPathResourceHandler.java b/components/server/src/main/java/com/hotels/styx/server/handlers/ClassPathResourceHandler.java
index 243a70527f..20c9e74b60 100644
--- a/components/server/src/main/java/com/hotels/styx/server/handlers/ClassPathResourceHandler.java
+++ b/components/server/src/main/java/com/hotels/styx/server/handlers/ClassPathResourceHandler.java
@@ -28,7 +28,7 @@
 import java.io.InputStream;
 
 import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
-import static com.hotels.styx.api.MediaTypes.mediaTypeOf;
+import static com.hotels.styx.server.handlers.MediaTypes.mediaTypeOf;
 import static com.hotels.styx.api.messages.HttpResponseStatus.FORBIDDEN;
 import static com.hotels.styx.api.messages.HttpResponseStatus.INTERNAL_SERVER_ERROR;
 import static com.hotels.styx.api.messages.HttpResponseStatus.NOT_FOUND;
diff --git a/components/api/src/main/java/com/hotels/styx/api/MediaTypes.java b/components/server/src/main/java/com/hotels/styx/server/handlers/MediaTypes.java
similarity index 98%
rename from components/api/src/main/java/com/hotels/styx/api/MediaTypes.java
rename to components/server/src/main/java/com/hotels/styx/server/handlers/MediaTypes.java
index b143d5fa05..8ea96bcb4f 100644
--- a/components/api/src/main/java/com/hotels/styx/api/MediaTypes.java
+++ b/components/server/src/main/java/com/hotels/styx/server/handlers/MediaTypes.java
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-package com.hotels.styx.api;
+package com.hotels.styx.server.handlers;
 
 import com.google.common.net.MediaType;
 
@@ -38,7 +38,7 @@
 /**
  * A collection of {@link MediaType}s associated with file extensions.
  */
-public final class MediaTypes {
+final class MediaTypes {
     private MediaTypes() {
     }
 
diff --git a/components/server/src/main/java/com/hotels/styx/server/handlers/StaticFileHandler.java b/components/server/src/main/java/com/hotels/styx/server/handlers/StaticFileHandler.java
index 6e6325bc03..7a92c76fae 100644
--- a/components/server/src/main/java/com/hotels/styx/server/handlers/StaticFileHandler.java
+++ b/components/server/src/main/java/com/hotels/styx/server/handlers/StaticFileHandler.java
@@ -31,7 +31,7 @@
 
 import static com.google.common.base.Throwables.propagate;
 import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;
-import static com.hotels.styx.api.MediaTypes.mediaTypeOf;
+import static com.hotels.styx.server.handlers.MediaTypes.mediaTypeOf;
 import static com.hotels.styx.common.http.handler.NotFoundHandler.NOT_FOUND_HANDLER;
 import static com.hotels.styx.api.messages.HttpResponseStatus.INTERNAL_SERVER_ERROR;
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/components/api/src/test/java/com/hotels/styx/api/handlers/MediaTypesTest.java b/components/server/src/test/java/com/hotels/styx/server/handlers/MediaTypesTest.java
similarity index 86%
rename from components/api/src/test/java/com/hotels/styx/api/handlers/MediaTypesTest.java
rename to components/server/src/test/java/com/hotels/styx/server/handlers/MediaTypesTest.java
index 3c71a1a94e..42b64ed31e 100644
--- a/components/api/src/test/java/com/hotels/styx/api/handlers/MediaTypesTest.java
+++ b/components/server/src/test/java/com/hotels/styx/server/handlers/MediaTypesTest.java
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-package com.hotels.styx.api.handlers;
+package com.hotels.styx.server.handlers;
 
 import com.google.common.net.MediaType;
 import org.testng.annotations.DataProvider;
@@ -31,11 +31,11 @@
 import static com.google.common.net.MediaType.PDF;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.google.common.net.MediaType.PNG;
-import static com.hotels.styx.api.MediaTypes.ICON;
-import static com.hotels.styx.api.MediaTypes.MICROSOFT_ASF_VIDEO;
-import static com.hotels.styx.api.MediaTypes.MICROSOFT_MS_VIDEO;
-import static com.hotels.styx.api.MediaTypes.WAV_AUDIO;
-import static com.hotels.styx.api.MediaTypes.mediaTypeForExtension;
+import static com.hotels.styx.server.handlers.MediaTypes.ICON;
+import static com.hotels.styx.server.handlers.MediaTypes.MICROSOFT_ASF_VIDEO;
+import static com.hotels.styx.server.handlers.MediaTypes.MICROSOFT_MS_VIDEO;
+import static com.hotels.styx.server.handlers.MediaTypes.WAV_AUDIO;
+import static com.hotels.styx.server.handlers.MediaTypes.mediaTypeForExtension;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
diff --git a/components/server/src/test/java/com/hotels/styx/server/handlers/StaticFileHandlerTest.java b/components/server/src/test/java/com/hotels/styx/server/handlers/StaticFileHandlerTest.java
index 5779b7e055..b784e68249 100644
--- a/components/server/src/test/java/com/hotels/styx/server/handlers/StaticFileHandlerTest.java
+++ b/components/server/src/test/java/com/hotels/styx/server/handlers/StaticFileHandlerTest.java
@@ -43,10 +43,10 @@
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.google.common.net.MediaType.PNG;
 import static com.hotels.styx.api.HttpRequest.get;
-import static com.hotels.styx.api.MediaTypes.ICON;
-import static com.hotels.styx.api.MediaTypes.MICROSOFT_ASF_VIDEO;
-import static com.hotels.styx.api.MediaTypes.MICROSOFT_MS_VIDEO;
-import static com.hotels.styx.api.MediaTypes.WAV_AUDIO;
+import static com.hotels.styx.server.handlers.MediaTypes.ICON;
+import static com.hotels.styx.server.handlers.MediaTypes.MICROSOFT_ASF_VIDEO;
+import static com.hotels.styx.server.handlers.MediaTypes.MICROSOFT_MS_VIDEO;
+import static com.hotels.styx.server.handlers.MediaTypes.WAV_AUDIO;
 import static com.hotels.styx.api.messages.HttpResponseStatus.NOT_FOUND;
 import static com.hotels.styx.api.messages.HttpResponseStatus.OK;
 import static com.hotels.styx.support.api.BlockingObservables.getFirst;