diff --git a/src/main/java/org/springframework/hateoas/server/mvc/TypeReferences.java b/src/main/java/org/springframework/hateoas/server/core/TypeReferences.java
similarity index 99%
rename from src/main/java/org/springframework/hateoas/server/mvc/TypeReferences.java
rename to src/main/java/org/springframework/hateoas/server/core/TypeReferences.java
index 16a7dad0..a1c5276a 100644
--- a/src/main/java/org/springframework/hateoas/server/mvc/TypeReferences.java
+++ b/src/main/java/org/springframework/hateoas/server/core/TypeReferences.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.server.mvc;
+package org.springframework.hateoas.server.core;
 
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/test/java/org/springframework/hateoas/config/HypermediaWebClientBeanPostProcessorTest.java b/src/test/java/org/springframework/hateoas/config/HypermediaWebClientBeanPostProcessorTest.java
index 92db34ce..a5610d98 100644
--- a/src/test/java/org/springframework/hateoas/config/HypermediaWebClientBeanPostProcessorTest.java
+++ b/src/test/java/org/springframework/hateoas/config/HypermediaWebClientBeanPostProcessorTest.java
@@ -37,7 +37,7 @@ import org.springframework.hateoas.client.Movie;
 import org.springframework.hateoas.client.Server;
 import org.springframework.hateoas.config.EnableHypermediaSupport;
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
-import org.springframework.hateoas.server.mvc.TypeReferences.EntityModelType;
+import org.springframework.hateoas.server.core.TypeReferences.EntityModelType;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
diff --git a/src/test/java/org/springframework/hateoas/config/HypermediaWebFluxConfigurerTest.java b/src/test/java/org/springframework/hateoas/config/HypermediaWebFluxConfigurerTest.java
index 6f286b24..29833657 100644
--- a/src/test/java/org/springframework/hateoas/config/HypermediaWebFluxConfigurerTest.java
+++ b/src/test/java/org/springframework/hateoas/config/HypermediaWebFluxConfigurerTest.java
@@ -38,8 +38,8 @@ import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.RepresentationModel;
 import org.springframework.hateoas.server.SimpleRepresentationModelAssembler;
-import org.springframework.hateoas.server.mvc.TypeReferences.CollectionModelType;
-import org.springframework.hateoas.server.mvc.TypeReferences.EntityModelType;
+import org.springframework.hateoas.server.core.TypeReferences.CollectionModelType;
+import org.springframework.hateoas.server.core.TypeReferences.EntityModelType;
 import org.springframework.hateoas.support.Employee;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.reactive.server.WebTestClient;
diff --git a/src/test/java/org/springframework/hateoas/server/mvc/TypeReferencesIntegrationTest.java b/src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java
similarity index 96%
rename from src/test/java/org/springframework/hateoas/server/mvc/TypeReferencesIntegrationTest.java
rename to src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java
index ced22ca7..1796f941 100755
--- a/src/test/java/org/springframework/hateoas/server/mvc/TypeReferencesIntegrationTest.java
+++ b/src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.server.mvc;
+package org.springframework.hateoas.server.core;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.test.web.client.MockRestServiceServer.*;
@@ -35,8 +35,9 @@ import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.config.EnableHypermediaSupport;
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
-import org.springframework.hateoas.server.mvc.TypeReferences.CollectionModelType;
-import org.springframework.hateoas.server.mvc.TypeReferences.EntityModelType;
+import org.springframework.hateoas.server.core.TypeReferences;
+import org.springframework.hateoas.server.core.TypeReferences.CollectionModelType;
+import org.springframework.hateoas.server.core.TypeReferences.EntityModelType;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ContextConfiguration;