diff --git a/README.md b/README.md
index bd0787cb..b6385d85 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ JSON Schema for [General Bikeshare Feed Specification(GBFS)](https://github.com/
 ## Language Bindings
 
 * [TypeScript ](models/typescript/README.md)
+* [Java ](models/java/README.md)
 
 Are we missing your favorite language? Consider contributing:
 
diff --git a/models/java/gbfs-java-model/bin/gbfs-download-extract.sh b/models/java/gbfs-java-model/bin/gbfs-download-extract.sh
deleted file mode 100755
index 4b0f66a7..00000000
--- a/models/java/gbfs-java-model/bin/gbfs-download-extract.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# Download and extract GBFS json schema
-validate () {
-    NAME=$1
-    VALUE=$2
-
-    if [ -z ${VALUE} ];
-    then
-        echo "$NAME not set"
-        exit 1
-    fi
-}
-
-validate "GITHUB_URL" ${GITHUB_URL}
-validate "SCHEMA_VERSION" ${SCHEMA_VERSION}
-validate "DESTINATION_PATH" ${DESTINATION_PATH}
-
-ZIP_FILE=downloaded.zip
-
-echo "GBFS JSON schema repo github URL: $GITHUB_URL"
-
-echo "Removing any existing contents in $DESTINATION_PATH"
-rm -rf ${DESTINATION_PATH}/*
-mkdir -p ${DESTINATION_PATH}
-
-if [ -f ${ZIP_FILE} ]; then
-  echo "Removing existing file $ZIP_FILE"
-  rm ${ZIP_FILE}
-fi
-
-WGET_URL="${GITHUB_URL}"
-echo "About to download from $WGET_URL"
-wget -q ${WGET_URL} -O ${ZIP_FILE}
-
-if [ -f ${ZIP_FILE} ]; then
-    echo "Done"
-    {
-    echo "Create ${DESTINATION_PATH}" &&
-    mkdir -p ${DESTINATION_PATH} &&
-
-    echo "Unzip files from zip file ${ZIP_FILE} to ${DESTINATION_PATH}" &&
-    unzip -q ${ZIP_FILE} -d ${DESTINATION_PATH} &&
-
-    echo "Remove zipfile ${ZIP_FILE}" &&
-    rm ${ZIP_FILE} &&
-
-    echo "Remove intermediate folder" &&
-    mv ${DESTINATION_PATH}/gbfs-json-schema-${SCHEMA_VERSION}/* ${DESTINATION_PATH} &&
-    rm -rf ${DESTINATION_PATH}/gbfs-json-schema-${SCHEMA_VERSION}
-
-    echo "Move each schema file into its own subfolder"
-    find ${DESTINATION_PATH}/. -type f -exec sh -c 'mkdir "${0%.*}" && mv "$0" "${0%.*}/"' {} \;
-
-    echo "JSON schema extracted to $DESTINATION_PATH"
-    } ||
-    {
-        (>&2 echo "Error extracting zip file $ZIP_FILE from $WGET_URL. See my previous output for details")
-        exit 1
-    }
-else
-    (>&2 echo "Error downloading zip from $WGET_URL")
-    exit 1
-fi
\ No newline at end of file
diff --git a/models/java/gbfs-java-model/pom.xml b/models/java/gbfs-java-model/pom.xml
index ff5ad906..2af91fb0 100644
--- a/models/java/gbfs-java-model/pom.xml
+++ b/models/java/gbfs-java-model/pom.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.entur.gbfs</groupId>
+    <groupId>org.mobilitydata</groupId>
     <artifactId>gbfs-java-model</artifactId>
     <version>3.1.3-SNAPSHOT</version>
 
     <name>gbfs-java-model</name>
 
     <description>Generates Java model from GBFS JSON schema using jsonschema2pojo.</description>
-    <url>https://github.com/entur/gbfs-java-model</url>
+    <url>https://github.com/MobilityData/gbfs-json-schema</url>
     <organization>
-        <name>Entur AS</name>
-        <url>http://www.entur.org/</url>
+        <name>MobilityData</name>
+        <url>https://mobilitydata.org/</url>
     </organization>
     <licenses>
         <license>
@@ -29,9 +29,9 @@
         </developer>
     </developers>
     <scm>
-        <connection>scm:git:ssh://git@github.com/entur/gbfs-java-model.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/entur/gbfs-java-model.git</developerConnection>
-        <url>https://github.com/entur/gbfs-java-model/tree/master</url>
+        <connection>scm:git:ssh://git@github.com/MobilityData/gbfs-json-schema.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/MobilityData/gbfs-json-schema.git</developerConnection>
+        <url>https://github.com/MobilityData/gbfs-json-schema/tree/master</url>
         <tag>HEAD</tag>
     </scm>
     <distributionManagement>
@@ -163,35 +163,13 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${maven-exec-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>download-extract-current-version</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <environmentVariables>
-                                <GITHUB_URL>${gbfsGithubUrl}</GITHUB_URL>
-                                <SCHEMA_VERSION>${schemaVersion}</SCHEMA_VERSION>
-                                <DESTINATION_PATH>src/main/resources/schema</DESTINATION_PATH>
-                            </environmentVariables>
-                            <executable>./bin/gbfs-download-extract.sh</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jsonschema2pojo</groupId>
                 <artifactId>jsonschema2pojo-maven-plugin</artifactId>
                 <version>${jsonschema2pojo-maven-plugin.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.entur.gbfs</groupId>
+                        <groupId>org.mobilitydata</groupId>
                         <artifactId>rule-factory</artifactId>
                         <version>1.0.0</version>
                     </dependency>
@@ -211,9 +189,9 @@
                             <serializable>true</serializable>
                             <initializeCollections>false</initializeCollections>
                             <generateBuilders>true</generateBuilders>
-                            <sourceDirectory>${basedir}/src/main/resources/schema/v2.2</sourceDirectory>
-                            <targetPackage>org.entur.gbfs.v2_2</targetPackage>
-                            <customRuleFactory>org.entur.gbfs.GeofencingRuleFactory</customRuleFactory>
+                            <sourceDirectory>${basedir}/../../../v2.2</sourceDirectory>
+                            <targetPackage>org.mobilitydata.v2_2</targetPackage>
+                            <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory>
                         </configuration>
                     </execution>
                     <execution>
@@ -230,9 +208,9 @@
                             <serializable>true</serializable>
                             <initializeCollections>false</initializeCollections>
                             <generateBuilders>true</generateBuilders>
-                            <sourceDirectory>${basedir}/src/main/resources/schema/v2.3</sourceDirectory>
-                            <targetPackage>org.entur.gbfs.v2_3</targetPackage>
-                            <customRuleFactory>org.entur.gbfs.GeofencingRuleFactory</customRuleFactory>
+                            <sourceDirectory>${basedir}/../../../v2.3</sourceDirectory>
+                            <targetPackage>org.mobilitydata.v2_3</targetPackage>
+                            <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory>
                         </configuration>
                     </execution>
                     <execution>
@@ -249,9 +227,9 @@
                             <serializable>true</serializable>
                             <initializeCollections>false</initializeCollections>
                             <generateBuilders>true</generateBuilders>
-                            <sourceDirectory>${basedir}/src/main/resources/schema/v3.0</sourceDirectory>
-                            <targetPackage>org.entur.gbfs.v3_0</targetPackage>
-                            <customRuleFactory>org.entur.gbfs.GeofencingRuleFactory</customRuleFactory>
+                            <sourceDirectory>${basedir}/../../../v3.0</sourceDirectory>
+                            <targetPackage>org.mobilitydata.v3_0</targetPackage>
+                            <customRuleFactory>org.mobilitydata.gbfs.GeofencingRuleFactory</customRuleFactory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFS.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFS.java
similarity index 95%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFS.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFS.java
index 072c1f48..7c0e7a27 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFS.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFS.java
@@ -1,4 +1,5 @@
-package org.entur.gbfs.v2_3.gbfs;
+package org.mobilitydata.gbfs.v2_2.gbfs;
+import org.mobilitydata.v2_2.GBFSGbfs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeed.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeed.java
similarity index 98%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeed.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeed.java
index bd555b74..7bc260bb 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeed.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeed.java
@@ -1,4 +1,4 @@
-package org.entur.gbfs.v2_2.gbfs;
+package org.mobilitydata.gbfs.v2_2.gbfs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeedName.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeedName.java
similarity index 75%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeedName.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeedName.java
index 2e56a267..2280520f 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeedName.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeedName.java
@@ -1,19 +1,19 @@
-package org.entur.gbfs.v2_2.gbfs;
+package org.mobilitydata.gbfs.v2_2.gbfs;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.entur.gbfs.v2_2.free_bike_status.GBFSFreeBikeStatus;
-import org.entur.gbfs.v2_2.gbfs_versions.GBFSGbfsVersions;
-import org.entur.gbfs.v2_2.geofencing_zones.GBFSGeofencingZones;
-import org.entur.gbfs.v2_2.station_information.GBFSStationInformation;
-import org.entur.gbfs.v2_2.station_status.GBFSStationStatus;
-import org.entur.gbfs.v2_2.system_alerts.GBFSSystemAlerts;
-import org.entur.gbfs.v2_2.system_calendar.GBFSSystemCalendar;
-import org.entur.gbfs.v2_2.system_hours.GBFSSystemHours;
-import org.entur.gbfs.v2_2.system_information.GBFSSystemInformation;
-import org.entur.gbfs.v2_2.system_pricing_plans.GBFSSystemPricingPlans;
-import org.entur.gbfs.v2_2.system_regions.GBFSSystemRegions;
-import org.entur.gbfs.v2_2.vehicle_types.GBFSVehicleTypes;
+import org.mobilitydata.v2_2.GBFSFreeBikeStatus;
+import org.mobilitydata.v2_2.GBFSGbfsVersions;
+import org.mobilitydata.v2_2.GBFSGeofencingZones;
+import org.mobilitydata.v2_2.GBFSStationInformation;
+import org.mobilitydata.v2_2.GBFSStationStatus;
+import org.mobilitydata.v2_2.GBFSSystemAlerts;
+import org.mobilitydata.v2_2.GBFSSystemCalendar;
+import org.mobilitydata.v2_2.GBFSSystemHours;
+import org.mobilitydata.v2_2.GBFSSystemInformation;
+import org.mobilitydata.v2_2.GBFSSystemPricingPlans;
+import org.mobilitydata.v2_2.GBFSSystemRegions;
+import org.mobilitydata.v2_2.GBFSVehicleTypes;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeeds.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeeds.java
similarity index 94%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeeds.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeeds.java
index be55a4a3..3bd3fcb9 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFSFeeds.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeeds.java
@@ -1,4 +1,4 @@
-package org.entur.gbfs.v2_2.gbfs;
+package org.mobilitydata.gbfs.v2_2.gbfs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFS.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFS.java
similarity index 95%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFS.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFS.java
index fb2dd730..0928812e 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_2/gbfs/GBFS.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFS.java
@@ -1,4 +1,5 @@
-package org.entur.gbfs.v2_2.gbfs;
+package org.mobilitydata.gbfs.v2_3.gbfs;
+import org.mobilitydata.v2_3.GBFSGbfs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeed.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeed.java
similarity index 98%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeed.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeed.java
index f371054b..f16af818 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeed.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeed.java
@@ -1,4 +1,4 @@
-package org.entur.gbfs.v2_3.gbfs;
+package org.mobilitydata.gbfs.v2_3.gbfs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeedName.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeedName.java
similarity index 74%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeedName.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeedName.java
index e94f596f..5c740d16 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeedName.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeedName.java
@@ -1,25 +1,26 @@
-package org.entur.gbfs.v2_3.gbfs;
+package org.mobilitydata.gbfs.v2_3.gbfs;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.entur.gbfs.v2_3.free_bike_status.GBFSFreeBikeStatus;
-import org.entur.gbfs.v2_3.gbfs_versions.GBFSGbfsVersions;
-import org.entur.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones;
-import org.entur.gbfs.v2_3.station_information.GBFSStationInformation;
-import org.entur.gbfs.v2_3.station_status.GBFSStationStatus;
-import org.entur.gbfs.v2_3.system_alerts.GBFSSystemAlerts;
-import org.entur.gbfs.v2_3.system_calendar.GBFSSystemCalendar;
-import org.entur.gbfs.v2_3.system_hours.GBFSSystemHours;
-import org.entur.gbfs.v2_3.system_information.GBFSSystemInformation;
-import org.entur.gbfs.v2_3.system_pricing_plans.GBFSSystemPricingPlans;
-import org.entur.gbfs.v2_3.system_regions.GBFSSystemRegions;
-import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleTypes;
+import org.mobilitydata.v2_3.GBFSFreeBikeStatus;
+import org.mobilitydata.v2_3.GBFSGbfsVersions;
+import org.mobilitydata.v2_3.GBFSGeofencingZones;
+import org.mobilitydata.v2_3.GBFSStationInformation;
+import org.mobilitydata.v2_3.GBFSStationStatus;
+import org.mobilitydata.v2_3.GBFSSystemAlerts;
+import org.mobilitydata.v2_3.GBFSSystemCalendar;
+import org.mobilitydata.v2_3.GBFSSystemHours;
+import org.mobilitydata.v2_3.GBFSSystemInformation;
+import org.mobilitydata.v2_3.GBFSSystemPricingPlans;
+import org.mobilitydata.v2_3.GBFSSystemRegions;
+import org.mobilitydata.v2_3.GBFSVehicleTypes;
+import org.mobilitydata.v2_3.GBFSGbfs;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public enum GBFSFeedName {
-    GBFS("gbfs", org.entur.gbfs.v2_3.gbfs.GBFS.class),
+    GBFS("gbfs", GBFSGbfs.class),
     GBFSVersions("gbfs_versions", GBFSGbfsVersions.class),
     SystemInformation("system_information", GBFSSystemInformation.class),
     VehicleTypes("vehicle_types", GBFSVehicleTypes.class),
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeeds.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeeds.java
similarity index 94%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeeds.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeeds.java
index 4a482963..cdd21828 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v2_3/gbfs/GBFSFeeds.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeeds.java
@@ -1,4 +1,4 @@
-package org.entur.gbfs.v2_3.gbfs;
+package org.mobilitydata.gbfs.v2_3.gbfs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
diff --git a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedName.java b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSFeedName.java
similarity index 70%
rename from models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedName.java
rename to models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSFeedName.java
index 36f8e402..f14a2656 100644
--- a/models/java/gbfs-java-model/src/main/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedName.java
+++ b/models/java/gbfs-java-model/src/main/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSFeedName.java
@@ -1,15 +1,17 @@
-package org.entur.gbfs.v3_0.gbfs;
-
-import org.entur.gbfs.v3_0.gbfs_versions.GBFSGbfsVersions;
-import org.entur.gbfs.v3_0.geofencing_zones.GBFSGeofencingZones;
-import org.entur.gbfs.v3_0.station_information.GBFSStationInformation;
-import org.entur.gbfs.v3_0.station_status.GBFSStationStatus;
-import org.entur.gbfs.v3_0.system_alerts.GBFSSystemAlerts;
-import org.entur.gbfs.v3_0.system_information.GBFSSystemInformation;
-import org.entur.gbfs.v3_0.system_pricing_plans.GBFSSystemPricingPlans;
-import org.entur.gbfs.v3_0.system_regions.GBFSSystemRegions;
-import org.entur.gbfs.v3_0.vehicle_status.GBFSVehicleStatus;
-import org.entur.gbfs.v3_0.vehicle_types.GBFSVehicleTypes;
+package org.mobilitydata.gbfs.v3_0.gbfs;
+
+import org.mobilitydata.v3_0.GBFSGbfsVersions;
+import org.mobilitydata.v3_0.GBFSGeofencingZones;
+import org.mobilitydata.v3_0.GBFSStationInformation;
+import org.mobilitydata.v3_0.GBFSStationStatus;
+import org.mobilitydata.v3_0.GBFSSystemAlerts;
+import org.mobilitydata.v3_0.GBFSSystemInformation;
+import org.mobilitydata.v3_0.GBFSSystemPricingPlans;
+import org.mobilitydata.v3_0.GBFSSystemRegions;
+import org.mobilitydata.v3_0.GBFSVehicleStatus;
+import org.mobilitydata.v3_0.GBFSVehicleTypes;
+import org.mobilitydata.v3_0.GBFSFeed;
+import org.mobilitydata.v3_0.GBFSGbfs;
 
 import java.util.EnumMap;
 import java.util.Map;
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedNameTest.java b/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedNameTest.java
deleted file mode 100644
index 68fbfb53..00000000
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSFeedNameTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.entur.gbfs.v3_0.gbfs;
-
-import org.entur.gbfs.v3_0.gbfs.GBFSFeed;
-import org.entur.gbfs.v3_0.station_information.GBFSStationInformation;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class GBFSFeedNameTest {
-
-    @Test
-    void value() {
-        Assertions.assertEquals("station_information", org.entur.gbfs.v3_0.gbfs.GBFSFeed.Name.STATION_INFORMATION.value());
-    }
-
-    @Test
-    void implementingClass() {
-        assertEquals(GBFSStationInformation.class, org.entur.gbfs.v3_0.gbfs.GBFSFeedName.implementingClass(org.entur.gbfs.v3_0.gbfs.GBFSFeed.Name.STATION_INFORMATION));
-    }
-
-    @Test
-    void fromValue() {
-        assertEquals(org.entur.gbfs.v3_0.gbfs.GBFSFeed.Name.STATION_INFORMATION, org.entur.gbfs.v3_0.gbfs.GBFSFeed.Name.fromValue("station_information"));
-    }
-
-    @Test
-    void fromClass() {
-        assertEquals(GBFSFeed.Name.STATION_INFORMATION, GBFSFeedName.fromClass(GBFSStationInformation.class));
-    }
-}
\ No newline at end of file
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/TestBase.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/TestBase.java
similarity index 95%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/TestBase.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/TestBase.java
index 5ac9e577..6d16c588 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/TestBase.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/TestBase.java
@@ -1,4 +1,4 @@
-package org.entur.gbfs;
+package org.mobilitydata.gbfs;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/free_bike_status/FreeBikeStatusTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/free_bike_status/FreeBikeStatusTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/free_bike_status/FreeBikeStatusTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/free_bike_status/FreeBikeStatusTest.java
index 6ec982e7..8c60d14d 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/free_bike_status/FreeBikeStatusTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/free_bike_status/FreeBikeStatusTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.free_bike_status;
+package org.mobilitydata.gbfs.v2_2.free_bike_status;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSFreeBikeStatus;
 import org.junit.jupiter.api.Test;
 
 class FreeBikeStatusTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs/GBFSFeedNameTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeedNameTest.java
similarity index 86%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs/GBFSFeedNameTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeedNameTest.java
index c9a1106c..b0d5b6da 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs/GBFSFeedNameTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSFeedNameTest.java
@@ -1,6 +1,6 @@
-package org.entur.gbfs.v2_2.gbfs;
+package org.mobilitydata.gbfs.v2_2.gbfs;
 
-import org.entur.gbfs.v2_2.station_information.GBFSStationInformation;
+import org.mobilitydata.v2_2.GBFSStationInformation;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs/GBFSTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSTest.java
similarity index 69%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs/GBFSTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSTest.java
index 25e975f8..be0cecdf 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs/GBFSTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs/GBFSTest.java
@@ -1,6 +1,6 @@
-package org.entur.gbfs.v2_3.gbfs;
+package org.mobilitydata.gbfs.v2_2.gbfs;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
 import org.junit.jupiter.api.Test;
 
 class GBFSTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs_versions/GBFSVersionsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs_versions/GBFSVersionsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs_versions/GBFSVersionsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs_versions/GBFSVersionsTest.java
index 5196d07d..59a8cc17 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs_versions/GBFSVersionsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/gbfs_versions/GBFSVersionsTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.gbfs_versions;
+package org.mobilitydata.gbfs.v2_2.gbfs_versions;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSGbfsVersions;
 import org.junit.jupiter.api.Test;
 
 class GBFSVersionsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/geofencing_zones/GeofencingZonesTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/geofencing_zones/GeofencingZonesTest.java
similarity index 77%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/geofencing_zones/GeofencingZonesTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/geofencing_zones/GeofencingZonesTest.java
index 0a15d5f1..1d9e6194 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/geofencing_zones/GeofencingZonesTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/geofencing_zones/GeofencingZonesTest.java
@@ -1,6 +1,8 @@
-package org.entur.gbfs.v2_2.geofencing_zones;
+package org.mobilitydata.gbfs.v2_2.geofencing_zones;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSFeature;
+import org.mobilitydata.v2_2.GBFSGeofencingZones;
 import org.geojson.LngLatAlt;
 import org.junit.jupiter.api.Test;
 
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/station_information/StationInformationTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/station_information/StationInformationTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/station_information/StationInformationTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/station_information/StationInformationTest.java
index f6c89e2b..887944ba 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/station_information/StationInformationTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/station_information/StationInformationTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.station_information;
+package org.mobilitydata.gbfs.v2_2.station_information;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSStationInformation;
 import org.junit.jupiter.api.Test;
 
 class StationInformationTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/station_status/StationStatusTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/station_status/StationStatusTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/station_status/StationStatusTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/station_status/StationStatusTest.java
index 9b522e01..3e3ece4a 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/station_status/StationStatusTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/station_status/StationStatusTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.station_status;
+package org.mobilitydata.gbfs.v2_2.station_status;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSStationStatus;
 import org.junit.jupiter.api.Test;
 
 class StationStatusTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_alerts/SystemAlertsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_alerts/SystemAlertsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_alerts/SystemAlertsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_alerts/SystemAlertsTest.java
index c2eba48b..6dcbb279 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_alerts/SystemAlertsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_alerts/SystemAlertsTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.system_alerts;
+package org.mobilitydata.gbfs.v2_2.system_alerts;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSSystemAlerts;
 import org.junit.jupiter.api.Test;
 
 class SystemAlertsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_calendar/SystemCalendarTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_calendar/SystemCalendarTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_calendar/SystemCalendarTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_calendar/SystemCalendarTest.java
index bf2e90d8..022ecf30 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_calendar/SystemCalendarTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_calendar/SystemCalendarTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.system_calendar;
+package org.mobilitydata.gbfs.v2_2.system_calendar;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSSystemCalendar;
 import org.junit.jupiter.api.Test;
 
 class SystemCalendarTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_hours/SystemHoursTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_hours/SystemHoursTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_hours/SystemHoursTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_hours/SystemHoursTest.java
index a4b2ddf2..951ed124 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_hours/SystemHoursTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_hours/SystemHoursTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.system_hours;
+package org.mobilitydata.gbfs.v2_2.system_hours;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSSystemHours;
 import org.junit.jupiter.api.Test;
 
 class SystemHoursTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_information/SystemInformationTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_information/SystemInformationTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_information/SystemInformationTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_information/SystemInformationTest.java
index 52544a66..cfa01190 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_information/SystemInformationTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_information/SystemInformationTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v2_2.system_information;
+package org.mobilitydata.gbfs.v2_2.system_information;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v2_2.system_pricing_plans.GBFSSystemPricingPlans;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSSystemPricingPlans;
 import org.junit.jupiter.api.Test;
 
 class SystemInformationTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_pricing_plans/SystemPricingPlansTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_pricing_plans/SystemPricingPlansTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_pricing_plans/SystemPricingPlansTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_pricing_plans/SystemPricingPlansTest.java
index 5be742a8..2d513d62 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_pricing_plans/SystemPricingPlansTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_pricing_plans/SystemPricingPlansTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.system_pricing_plans;
+package org.mobilitydata.gbfs.v2_2.system_pricing_plans;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSSystemPricingPlans;
 import org.junit.jupiter.api.Test;
 
 class SystemPricingPlansTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_regions/SystemRegionsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_regions/SystemRegionsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_regions/SystemRegionsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_regions/SystemRegionsTest.java
index 5c895907..82c2ceae 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/system_regions/SystemRegionsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/system_regions/SystemRegionsTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.system_regions;
+package org.mobilitydata.gbfs.v2_2.system_regions;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSSystemRegions;
 import org.junit.jupiter.api.Test;
 
 class SystemRegionsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/vehicle_types/VehicleTypesTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/vehicle_types/VehicleTypesTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/vehicle_types/VehicleTypesTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/vehicle_types/VehicleTypesTest.java
index d2d9f6ab..ea3304b0 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/vehicle_types/VehicleTypesTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_2/vehicle_types/VehicleTypesTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.vehicle_types;
+package org.mobilitydata.gbfs.v2_2.vehicle_types;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_2.GBFSVehicleTypes;
 import org.junit.jupiter.api.Test;
 
 class VehicleTypesTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/free_bike_status/FreeBikeStatusTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/free_bike_status/FreeBikeStatusTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/free_bike_status/FreeBikeStatusTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/free_bike_status/FreeBikeStatusTest.java
index 0dfcf3c2..3c0ed6fc 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/free_bike_status/FreeBikeStatusTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/free_bike_status/FreeBikeStatusTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.free_bike_status;
+package org.mobilitydata.gbfs.v2_3.free_bike_status;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSFreeBikeStatus;
 import org.junit.jupiter.api.Test;
 
 class FreeBikeStatusTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs/GBFSFeedNameTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeedNameTest.java
similarity index 87%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs/GBFSFeedNameTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeedNameTest.java
index 64f36a08..8fc87dbc 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/gbfs/GBFSFeedNameTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSFeedNameTest.java
@@ -1,6 +1,6 @@
-package org.entur.gbfs.v2_3.gbfs;
+package org.mobilitydata.gbfs.v2_3.gbfs;
 
-import org.entur.gbfs.v2_3.station_information.GBFSStationInformation;
+import org.mobilitydata.v2_3.GBFSStationInformation;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs/GBFSTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSTest.java
similarity index 69%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs/GBFSTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSTest.java
index e11bf488..634c651d 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs/GBFSTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs/GBFSTest.java
@@ -1,6 +1,6 @@
-package org.entur.gbfs.v2_2.gbfs;
+package org.mobilitydata.gbfs.v2_3.gbfs;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
 import org.junit.jupiter.api.Test;
 
 class GBFSTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs_versions/GBFSVersionsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs_versions/GBFSVersionsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs_versions/GBFSVersionsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs_versions/GBFSVersionsTest.java
index 12f40a70..960c7bba 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/gbfs_versions/GBFSVersionsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/gbfs_versions/GBFSVersionsTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.gbfs_versions;
+package org.mobilitydata.gbfs.v2_3.gbfs_versions;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSGbfsVersions;
 import org.junit.jupiter.api.Test;
 
 class GBFSVersionsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/geofencing_zones/GeofencingZonesTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/geofencing_zones/GeofencingZonesTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/geofencing_zones/GeofencingZonesTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/geofencing_zones/GeofencingZonesTest.java
index cd43b9c7..bda0339f 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/geofencing_zones/GeofencingZonesTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/geofencing_zones/GeofencingZonesTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.geofencing_zones;
+package org.mobilitydata.gbfs.v2_3.geofencing_zones;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSGeofencingZones;
 import org.junit.jupiter.api.Test;
 
 class GeofencingZonesTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/station_information/StationInformationTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/station_information/StationInformationTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/station_information/StationInformationTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/station_information/StationInformationTest.java
index 30428c23..78ba6c13 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_2/station_information/StationInformationTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/station_information/StationInformationTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_2.station_information;
+package org.mobilitydata.gbfs.v2_3.station_information;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSStationInformation;
 import org.junit.jupiter.api.Test;
 
 class StationInformationTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/station_status/StationStatusTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/station_status/StationStatusTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/station_status/StationStatusTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/station_status/StationStatusTest.java
index bbe4f144..84c7ef99 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/station_status/StationStatusTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/station_status/StationStatusTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.station_status;
+package org.mobilitydata.gbfs.v2_3.station_status;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSStationStatus;
 import org.junit.jupiter.api.Test;
 
 class StationStatusTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_alerts/SystemAlertsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_alerts/SystemAlertsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_alerts/SystemAlertsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_alerts/SystemAlertsTest.java
index ab89b9d3..0ea87518 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_alerts/SystemAlertsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_alerts/SystemAlertsTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.system_alerts;
+package org.mobilitydata.gbfs.v2_3.system_alerts;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSSystemAlerts;
 import org.junit.jupiter.api.Test;
 
 class SystemAlertsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_calendar/SystemCalendarTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_calendar/SystemCalendarTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_calendar/SystemCalendarTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_calendar/SystemCalendarTest.java
index c0acfa0c..c96930ae 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_calendar/SystemCalendarTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_calendar/SystemCalendarTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.system_calendar;
+package org.mobilitydata.gbfs.v2_3.system_calendar;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSSystemCalendar;
 import org.junit.jupiter.api.Test;
 
 class SystemCalendarTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_hours/SystemHoursTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_hours/SystemHoursTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_hours/SystemHoursTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_hours/SystemHoursTest.java
index f696f7b4..e24c979c 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_hours/SystemHoursTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_hours/SystemHoursTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.system_hours;
+package org.mobilitydata.gbfs.v2_3.system_hours;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSSystemHours;
 import org.junit.jupiter.api.Test;
 
 class SystemHoursTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_information/SystemInformationTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_information/SystemInformationTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_information/SystemInformationTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_information/SystemInformationTest.java
index f0030da5..e75f7c83 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_information/SystemInformationTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_information/SystemInformationTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.system_information;
+package org.mobilitydata.gbfs.v2_3.system_information;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSSystemInformation;
 import org.junit.jupiter.api.Test;
 
 class SystemInformationTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_pricing_plans/SystemPricingPlansTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_pricing_plans/SystemPricingPlansTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_pricing_plans/SystemPricingPlansTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_pricing_plans/SystemPricingPlansTest.java
index 74777cf9..bd9ab9da 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_pricing_plans/SystemPricingPlansTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_pricing_plans/SystemPricingPlansTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.system_pricing_plans;
+package org.mobilitydata.gbfs.v2_3.system_pricing_plans;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSSystemPricingPlans;
 import org.junit.jupiter.api.Test;
 
 class SystemPricingPlansTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_regions/SystemRegionsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_regions/SystemRegionsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_regions/SystemRegionsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_regions/SystemRegionsTest.java
index 2b24b717..57fb09af 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/system_regions/SystemRegionsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/system_regions/SystemRegionsTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.system_regions;
+package org.mobilitydata.gbfs.v2_3.system_regions;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSSystemRegions;
 import org.junit.jupiter.api.Test;
 
 class SystemRegionsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/vehicle_types/VehicleTypesTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/vehicle_types/VehicleTypesTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/vehicle_types/VehicleTypesTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/vehicle_types/VehicleTypesTest.java
index bfe74958..97710b9e 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v2_3/vehicle_types/VehicleTypesTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v2_3/vehicle_types/VehicleTypesTest.java
@@ -1,6 +1,7 @@
-package org.entur.gbfs.v2_3.vehicle_types;
+package org.mobilitydata.gbfs.v2_3.vehicle_types;
 
-import org.entur.gbfs.TestBase;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v2_3.GBFSVehicleTypes;
 import org.junit.jupiter.api.Test;
 
 class VehicleTypesTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSFeedNameTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSFeedNameTest.java
new file mode 100644
index 00000000..7fe1a8f6
--- /dev/null
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSFeedNameTest.java
@@ -0,0 +1,31 @@
+package org.mobilitydata.gbfs.v3_0.gbfs;
+
+import org.mobilitydata.v3_0.GBFSFeed;
+import org.mobilitydata.v3_0.GBFSStationInformation;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class GBFSFeedNameTest {
+
+    @Test
+    void value() {
+        Assertions.assertEquals("station_information", org.mobilitydata.v3_0.GBFSFeed.Name.STATION_INFORMATION.value());
+    }
+
+    @Test
+    void implementingClass() {
+        assertEquals(GBFSStationInformation.class, org.mobilitydata.gbfs.v3_0.gbfs.GBFSFeedName.implementingClass(org.mobilitydata.v3_0.GBFSFeed.Name.STATION_INFORMATION));
+    }
+
+    @Test
+    void fromValue() {
+        assertEquals(org.mobilitydata.v3_0.GBFSFeed.Name.STATION_INFORMATION, org.mobilitydata.v3_0.GBFSFeed.Name.fromValue("station_information"));
+    }
+
+    @Test
+    void fromClass() {
+        assertEquals(GBFSFeed.Name.STATION_INFORMATION, GBFSFeedName.fromClass(GBFSStationInformation.class));
+    }
+}
\ No newline at end of file
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSTest.java
similarity index 61%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSTest.java
index e7fbe6fd..1ef91867 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs/GBFSTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs/GBFSTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.gbfs;
+package org.mobilitydata.gbfs.v3_0.gbfs;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.gbfs.GBFSGbfs;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSGbfs;
 import org.junit.jupiter.api.Test;
 
 class GBFSTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs_versions/GBFSVersionsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs_versions/GBFSVersionsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs_versions/GBFSVersionsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs_versions/GBFSVersionsTest.java
index 5d54678b..5e5114d6 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/gbfs_versions/GBFSVersionsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/gbfs_versions/GBFSVersionsTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.gbfs_versions;
+package org.mobilitydata.gbfs.v3_0.gbfs_versions;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.gbfs_versions.GBFSGbfsVersions;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSGbfsVersions;
 import org.junit.jupiter.api.Test;
 
 class GBFSVersionsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/geofencing_zones/GeofencingZonesTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/geofencing_zones/GeofencingZonesTest.java
similarity index 58%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/geofencing_zones/GeofencingZonesTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/geofencing_zones/GeofencingZonesTest.java
index 4bd1dede..56928e6b 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/geofencing_zones/GeofencingZonesTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/geofencing_zones/GeofencingZonesTest.java
@@ -1,8 +1,8 @@
-package org.entur.gbfs.v3_0.geofencing_zones;
+package org.mobilitydata.gbfs.v3_0.geofencing_zones;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.geofencing_zones.GBFSFeature;
-import org.entur.gbfs.v3_0.geofencing_zones.GBFSGeofencingZones;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSFeature;
+import org.mobilitydata.v3_0.GBFSGeofencingZones;
 import org.geojson.LngLatAlt;
 import org.junit.jupiter.api.Test;
 
@@ -11,7 +11,7 @@
 class GeofencingZonesTest extends TestBase {
     @Test
     void testUnmarshal() {
-        org.entur.gbfs.v3_0.geofencing_zones.GBFSGeofencingZones zones = assertUnmarshalDoesNotThrow("v3_0/geofencing_zones.json", GBFSGeofencingZones.class);
+        org.mobilitydata.v3_0.GBFSGeofencingZones zones = assertUnmarshalDoesNotThrow("v3_0/geofencing_zones.json", GBFSGeofencingZones.class);
         GBFSFeature feature = zones.getData().getGeofencingZones().getFeatures().get(0);
         LngLatAlt coord = feature.getGeometry().getCoordinates().get(0).get(0).get(0);
         assertEquals(45.562982, coord.getLatitude(), 0.01);
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/manifest/ManifestTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/manifest/ManifestTest.java
similarity index 61%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/manifest/ManifestTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/manifest/ManifestTest.java
index a21f04d7..b8ad064d 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/manifest/ManifestTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/manifest/ManifestTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.manifest;
+package org.mobilitydata.gbfs.v3_0.manifest;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.manifest.GBFSManifest;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSManifest;
 import org.junit.jupiter.api.Test;
 
 class ManifestTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/station_information/StationInformationTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/station_information/StationInformationTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/station_information/StationInformationTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/station_information/StationInformationTest.java
index bb503755..01d6bb42 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/station_information/StationInformationTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/station_information/StationInformationTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.station_information;
+package org.mobilitydata.gbfs.v3_0.station_information;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.station_information.GBFSStationInformation;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSStationInformation;
 import org.junit.jupiter.api.Test;
 
 class StationInformationTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/station_status/StationStatusTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/station_status/StationStatusTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/station_status/StationStatusTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/station_status/StationStatusTest.java
index af289f99..f00b69ff 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/station_status/StationStatusTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/station_status/StationStatusTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.station_status;
+package org.mobilitydata.gbfs.v3_0.station_status;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.station_status.GBFSStationStatus;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSStationStatus;
 import org.junit.jupiter.api.Test;
 
 class StationStatusTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_alerts/SystemAlertsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_alerts/SystemAlertsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_alerts/SystemAlertsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_alerts/SystemAlertsTest.java
index 4e15c347..fbf4d049 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_alerts/SystemAlertsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_alerts/SystemAlertsTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.system_alerts;
+package org.mobilitydata.gbfs.v3_0.system_alerts;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.system_alerts.GBFSSystemAlerts;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSSystemAlerts;
 import org.junit.jupiter.api.Test;
 
 class SystemAlertsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_information/SystemInformationTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_information/SystemInformationTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_information/SystemInformationTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_information/SystemInformationTest.java
index 98627ed1..0558ed8b 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_information/SystemInformationTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_information/SystemInformationTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.system_information;
+package org.mobilitydata.gbfs.v3_0.system_information;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.system_information.GBFSSystemInformation;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSSystemInformation;
 import org.junit.jupiter.api.Test;
 
 class SystemInformationTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_pricing_plans/SystemPricingPlansTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_pricing_plans/SystemPricingPlansTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_pricing_plans/SystemPricingPlansTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_pricing_plans/SystemPricingPlansTest.java
index 68df0357..46f92957 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_pricing_plans/SystemPricingPlansTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_pricing_plans/SystemPricingPlansTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.system_pricing_plans;
+package org.mobilitydata.gbfs.v3_0.system_pricing_plans;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.system_pricing_plans.GBFSSystemPricingPlans;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSSystemPricingPlans;
 import org.junit.jupiter.api.Test;
 
 class SystemPricingPlansTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_regions/SystemRegionsTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_regions/SystemRegionsTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_regions/SystemRegionsTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_regions/SystemRegionsTest.java
index c5f7a0b5..3f8312fe 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/system_regions/SystemRegionsTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/system_regions/SystemRegionsTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.system_regions;
+package org.mobilitydata.gbfs.v3_0.system_regions;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.system_regions.GBFSSystemRegions;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSSystemRegions;
 import org.junit.jupiter.api.Test;
 
 class SystemRegionsTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/vehicle_status/VehicleStatusTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/vehicle_status/VehicleStatusTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/vehicle_status/VehicleStatusTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/vehicle_status/VehicleStatusTest.java
index 03523ff3..8c5eac45 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/vehicle_status/VehicleStatusTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/vehicle_status/VehicleStatusTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.vehicle_status;
+package org.mobilitydata.gbfs.v3_0.vehicle_status;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.vehicle_status.GBFSVehicleStatus;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSVehicleStatus;
 import org.junit.jupiter.api.Test;
 
 class VehicleStatusTest extends TestBase {
diff --git a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/vehicle_types/VehicleTypesTest.java b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/vehicle_types/VehicleTypesTest.java
similarity index 60%
rename from models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/vehicle_types/VehicleTypesTest.java
rename to models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/vehicle_types/VehicleTypesTest.java
index 2c5e92f2..9ab01cda 100644
--- a/models/java/gbfs-java-model/src/test/java/org/entur/gbfs/v3_0/vehicle_types/VehicleTypesTest.java
+++ b/models/java/gbfs-java-model/src/test/java/org/mobilitydata/gbfs/v3_0/vehicle_types/VehicleTypesTest.java
@@ -1,7 +1,7 @@
-package org.entur.gbfs.v3_0.vehicle_types;
+package org.mobilitydata.gbfs.v3_0.vehicle_types;
 
-import org.entur.gbfs.TestBase;
-import org.entur.gbfs.v3_0.vehicle_types.GBFSVehicleTypes;
+import org.mobilitydata.gbfs.TestBase;
+import org.mobilitydata.v3_0.GBFSVehicleTypes;
 import org.junit.jupiter.api.Test;
 
 class VehicleTypesTest extends TestBase {
diff --git a/models/java/pom.xml b/models/java/pom.xml
index 9068bff9..58562142 100644
--- a/models/java/pom.xml
+++ b/models/java/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.entur.gbfs</groupId>
+    <groupId>org.mobilitydata</groupId>
     <artifactId>gbfs-java-model-parent</artifactId>
     <version>1.0.0</version>
 
diff --git a/models/java/rule-factory/pom.xml b/models/java/rule-factory/pom.xml
index 54320356..546a7e6c 100644
--- a/models/java/rule-factory/pom.xml
+++ b/models/java/rule-factory/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.entur.gbfs</groupId>
+    <groupId>org.mobilitydata</groupId>
     <artifactId>rule-factory</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
diff --git a/models/java/rule-factory/src/main/java/org/entur/gbfs/GeofencingRuleFactory.java b/models/java/rule-factory/src/main/java/org/mobilitydata/gbfs/GeofencingRuleFactory.java
similarity index 98%
rename from models/java/rule-factory/src/main/java/org/entur/gbfs/GeofencingRuleFactory.java
rename to models/java/rule-factory/src/main/java/org/mobilitydata/gbfs/GeofencingRuleFactory.java
index 94ee36d4..b26421b3 100644
--- a/models/java/rule-factory/src/main/java/org/entur/gbfs/GeofencingRuleFactory.java
+++ b/models/java/rule-factory/src/main/java/org/mobilitydata/gbfs/GeofencingRuleFactory.java
@@ -1,4 +1,4 @@
-package org.entur.gbfs;
+package org.mobilitydata.gbfs;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;