diff --git a/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java b/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java
index f9e3883..ed51f6e 100644
--- a/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java
+++ b/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java
@@ -20,16 +20,16 @@ import org.apache.logging.log4j.Logger;
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import cz.trask.migration.AbstractProcess;
-import cz.trask.migration.mapper.ApiDefinitionMapper;
-import cz.trask.migration.model.ApiDefinition32;
-import cz.trask.migration.model.ApiDefinition45;
-import cz.trask.migration.model.EndpointCertificates45;
+import cz.trask.migration.mapper.ApiDefinitionMapper32to45;
 import cz.trask.migration.model.FileType;
-import cz.trask.migration.model.HostInfo32;
 import cz.trask.migration.model.HttpResponse;
-import cz.trask.migration.model.OperationPolicySpecification45;
 import cz.trask.migration.model.RegisterResponse;
 import cz.trask.migration.model.TokenResponse;
+import cz.trask.migration.model.v32.ApiDefinition32;
+import cz.trask.migration.model.v32.HostInfo32;
+import cz.trask.migration.model.v45.ApiDefinition45;
+import cz.trask.migration.model.v45.EndpointCertificates45;
+import cz.trask.migration.model.v45.OperationPolicySpecification45;
 import io.apicurio.registry.rest.client.RegistryClient;
 import io.apicurio.registry.rest.client.RegistryClientFactory;
 import io.apicurio.registry.rest.v2.beans.ArtifactMetaData;
@@ -230,7 +230,7 @@ public class ExportToWso2FromV32 extends AbstractProcess {
 				}
 			}
 			if (apiDef != null && contentStr != null) {
-				ApiDefinition45 apiDef45 = ApiDefinitionMapper.map(apiDef, contentStr);
+				ApiDefinition45 apiDef45 = ApiDefinitionMapper32to45.map(apiDef, contentStr);
 				byte[] content = mapperYaml.writeValueAsBytes(apiDef45);
 				zos.putNextEntry(new ZipEntry(baseDir.concat("api.yaml")));
 				zos.write(content);
diff --git a/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper.java b/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java
similarity index 97%
rename from src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper.java
rename to src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java
index ea42ae3..5d35ed3 100644
--- a/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper.java
+++ b/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java
@@ -12,14 +12,14 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import cz.trask.migration.AbstractProcess;
-import cz.trask.migration.model.ApiDefinition32;
-import cz.trask.migration.model.ApiDefinition45;
-import cz.trask.migration.model.ApiDefinition45.ApiPolicies;
-import cz.trask.migration.model.ApiDefinition45.Operation;
-import cz.trask.migration.model.ApiDefinition45.OperationPolicies;
+import cz.trask.migration.model.v32.ApiDefinition32;
+import cz.trask.migration.model.v45.ApiDefinition45;
+import cz.trask.migration.model.v45.ApiDefinition45.ApiPolicies;
+import cz.trask.migration.model.v45.ApiDefinition45.Operation;
+import cz.trask.migration.model.v45.ApiDefinition45.OperationPolicies;
 import cz.trask.migration.util.CredentialsDecoder;
 
-public class ApiDefinitionMapper {
+public class ApiDefinitionMapper32to45 {
 
 	public static ApiDefinition45 map(ApiDefinition32 oldApi, String swagger) throws Exception {
 		if (oldApi == null)
diff --git a/src/main/java/cz/trask/migration/model/ApiDefinition32.java b/src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java
similarity index 99%
rename from src/main/java/cz/trask/migration/model/ApiDefinition32.java
rename to src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java
index 10630a3..2198d19 100644
--- a/src/main/java/cz/trask/migration/model/ApiDefinition32.java
+++ b/src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java
@@ -1,4 +1,4 @@
-package cz.trask.migration.model;
+package cz.trask.migration.model.v32;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/cz/trask/migration/model/HostInfo32.java b/src/main/java/cz/trask/migration/model/v32/HostInfo32.java
similarity index 86%
rename from src/main/java/cz/trask/migration/model/HostInfo32.java
rename to src/main/java/cz/trask/migration/model/v32/HostInfo32.java
index 8bd9465..780274a 100644
--- a/src/main/java/cz/trask/migration/model/HostInfo32.java
+++ b/src/main/java/cz/trask/migration/model/v32/HostInfo32.java
@@ -1,4 +1,4 @@
-package cz.trask.migration.model;
+package cz.trask.migration.model.v32;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/src/main/java/cz/trask/migration/model/ApiDefinition45.java b/src/main/java/cz/trask/migration/model/v45/ApiDefinition45.java
similarity index 99%
rename from src/main/java/cz/trask/migration/model/ApiDefinition45.java
rename to src/main/java/cz/trask/migration/model/v45/ApiDefinition45.java
index 0450ba3..e10b023 100644
--- a/src/main/java/cz/trask/migration/model/ApiDefinition45.java
+++ b/src/main/java/cz/trask/migration/model/v45/ApiDefinition45.java
@@ -1,4 +1,4 @@
-package cz.trask.migration.model;
+package cz.trask.migration.model.v45;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/cz/trask/migration/model/EndpointCertificates45.java b/src/main/java/cz/trask/migration/model/v45/EndpointCertificates45.java
similarity index 92%
rename from src/main/java/cz/trask/migration/model/EndpointCertificates45.java
rename to src/main/java/cz/trask/migration/model/v45/EndpointCertificates45.java
index 2fc8d3a..632ddc9 100644
--- a/src/main/java/cz/trask/migration/model/EndpointCertificates45.java
+++ b/src/main/java/cz/trask/migration/model/v45/EndpointCertificates45.java
@@ -1,4 +1,4 @@
-package cz.trask.migration.model;
+package cz.trask.migration.model.v45;
 
 import java.util.List;
 
diff --git a/src/main/java/cz/trask/migration/model/OperationPolicySpecification45.java b/src/main/java/cz/trask/migration/model/v45/OperationPolicySpecification45.java
similarity index 95%
rename from src/main/java/cz/trask/migration/model/OperationPolicySpecification45.java
rename to src/main/java/cz/trask/migration/model/v45/OperationPolicySpecification45.java
index 4e2294b..8a2eff2 100644
--- a/src/main/java/cz/trask/migration/model/OperationPolicySpecification45.java
+++ b/src/main/java/cz/trask/migration/model/v45/OperationPolicySpecification45.java
@@ -1,4 +1,4 @@
-package cz.trask.migration.model;
+package cz.trask.migration.model.v45;
 
 import java.util.ArrayList;
 import java.util.List;