diff --git a/src/main/java/cz/trask/migration/ApiSync.java b/src/main/java/cz/trask/migration/ApiSync.java
index 842a99e..88f6bae 100644
--- a/src/main/java/cz/trask/migration/ApiSync.java
+++ b/src/main/java/cz/trask/migration/ApiSync.java
@@ -4,15 +4,13 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import cz.trask.migration.impl.ExportToWso2;
-import cz.trask.migration.impl.ImportToApicurio;
+import cz.trask.migration.impl.import32.ImportToApicurio;
 import cz.trask.migration.model.StartParameters;
 
 public class ApiSync {
 
 	private static Logger log = LogManager.getLogger(ApiSync.class);
 
-	protected final static String resourceName = "api-operator.properties";
-
 	public static void main(String[] args) throws Exception {
 		log.info("API Operator started.");
 		if (args == null) {
diff --git a/src/main/java/cz/trask/migration/config/ConfigManager.java b/src/main/java/cz/trask/migration/config/ConfigManager.java
index 4aae903..04d1996 100644
--- a/src/main/java/cz/trask/migration/config/ConfigManager.java
+++ b/src/main/java/cz/trask/migration/config/ConfigManager.java
@@ -16,7 +16,7 @@ public final class ConfigManager {
 
 	private static final Logger log = LogManager.getLogger(ConfigManager.class);
 
-	private static final String PROPERTY_FILENAME = "api-operator.properties";
+	private static final String PROPERTY_FILENAME = "apicurio-migrator.properties";
 
 	// SOURCE
 	public static final String PROP_SOURCE_REGISTRATION_API_URL = "SOURCE_REGISTRATION_API_URL";
diff --git a/src/main/java/cz/trask/migration/impl/ExportToWso2.java b/src/main/java/cz/trask/migration/impl/ExportToWso2.java
index 2036369..9481e67 100644
--- a/src/main/java/cz/trask/migration/impl/ExportToWso2.java
+++ b/src/main/java/cz/trask/migration/impl/ExportToWso2.java
@@ -101,7 +101,7 @@ public class ExportToWso2 extends AbstractProcess {
 						api.getId(), ver.getVersion());
 				if (ref != null && !ref.isEmpty()) {
 					log.info("Artifact has {} references", ref.size());
-					byte[] data = ZipUtils.prepareApiZipFile(client, ver, ref);
+					byte[] data = ZipUtils.prepareApiZipFile32to45(client, ver, ref);
 					String fileName = api.getName() + "-" + ver.getVersion() + ".zip";
 					if (data != null && data.length > 0 && fileName != null && !fileName.isEmpty()) {
 						int responseCode = publishApiToWso2(fileName, data, tokenResponse);
diff --git a/src/main/java/cz/trask/migration/impl/ImportToApicurio.java b/src/main/java/cz/trask/migration/impl/import32/ImportToApicurio.java
similarity index 99%
rename from src/main/java/cz/trask/migration/impl/ImportToApicurio.java
rename to src/main/java/cz/trask/migration/impl/import32/ImportToApicurio.java
index ce4124b..09b4afd 100644
--- a/src/main/java/cz/trask/migration/impl/ImportToApicurio.java
+++ b/src/main/java/cz/trask/migration/impl/import32/ImportToApicurio.java
@@ -1,4 +1,4 @@
-package cz.trask.migration.impl;
+package cz.trask.migration.impl.import32;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/main/java/cz/trask/migration/model/FileType.java b/src/main/java/cz/trask/migration/model/FileType.java
index 92e2822..15d48e6 100644
--- a/src/main/java/cz/trask/migration/model/FileType.java
+++ b/src/main/java/cz/trask/migration/model/FileType.java
@@ -1,5 +1,5 @@
 package cz.trask.migration.model;
 
 public enum FileType {
-	APIDEF, OPENAPI, WSDL, POLICY, UNKNOWN
+	APIDEF, OPENAPI, WSDL, POLICY_IN, POLICY_OUT, POLICY_FAULT, CERTIFICATE, UNKNOWN
 }
diff --git a/src/main/java/cz/trask/migration/utils/ZipUtils.java b/src/main/java/cz/trask/migration/utils/ZipUtils.java
index bc874cf..5f4d85f 100644
--- a/src/main/java/cz/trask/migration/utils/ZipUtils.java
+++ b/src/main/java/cz/trask/migration/utils/ZipUtils.java
@@ -48,14 +48,20 @@ public class ZipUtils {
 
 	private static FileType determineFileType(String fileName) {
 		String lowerFileName = fileName.toLowerCase();
-		if (lowerFileName.endsWith("api.yaml")) {
+		if (lowerFileName.endsWith("/meta-information/api.yaml")) {
 			return FileType.APIDEF;
-		} else if (lowerFileName.contains("/definitions/swagger.yaml")) {
+		} else if (lowerFileName.endsWith("/meta-information/swagger.yaml")) {
 			return FileType.OPENAPI;
 		} else if (lowerFileName.endsWith(".wsdl")) {
 			return FileType.WSDL;
-		} else if (lowerFileName.contains("/policies/")) {
-			return FileType.POLICY;
+		} else if (lowerFileName.contains("/sequences/in-sequence")) {
+			return FileType.POLICY_IN;
+		} else if (lowerFileName.contains("/sequences/out-sequence")) {
+			return FileType.POLICY_OUT;
+		} else if (lowerFileName.contains("/sequences/fault-sequence")) {
+			return FileType.POLICY_FAULT;
+		} else if (lowerFileName.endsWith("/meta-information/endpoint_certificates.yaml")) {
+			return FileType.CERTIFICATE;
 		}
 		return FileType.UNKNOWN;
 	}
@@ -71,7 +77,7 @@ public class ZipUtils {
 		return buffer.toByteArray();
 	}
 
-	public static byte[] prepareApiZipFile(RegistryClient client, SearchedVersion ver, List<ArtifactReference> ref)
+	public static byte[] prepareApiZipFile32to45(RegistryClient client, SearchedVersion ver, List<ArtifactReference> ref)
 			throws IOException {
 
 		String baseDir = ver.getName() + "-" + ver.getVersion() + "/";
@@ -88,7 +94,7 @@ public class ZipUtils {
 
 				if (FileType.OPENAPI.toString().equals(amd.getGroupId())) {
 					subDir = "Definitions/";
-				} else if (FileType.POLICY.toString().equals(amd.getGroupId())) {
+				} else if (FileType.POLICY_IN.toString().equals(amd.getGroupId())) {
 					subDir = "Policies/";
 				}
 
diff --git a/src/main/resources/api-operator.properties b/src/main/resources/apicurio-migrator.properties
similarity index 93%
rename from src/main/resources/api-operator.properties
rename to src/main/resources/apicurio-migrator.properties
index 52333ff..9d1e690 100644
--- a/src/main/resources/api-operator.properties
+++ b/src/main/resources/apicurio-migrator.properties
@@ -1,6 +1,6 @@
 SOURCE_REGISTRATION_API_URL = https://localhost:9443/client-registration/v0.17/register
 SOURCE_PUBLISHER_API_URL = https://localhost:9443/api/am/publisher
-SOURCE_DEVPORTAL_API_URL = https://localhost:9443/api/am/devportal
+SOURCE_DEVPORTAL_API_URL = https://localhost:9443/api/am/store
 SOURCE_PUBLISHER_TOKEN_URL = https://localhost:9443/oauth2/token
 SOURCE_WSO2_USER = YWRtaW46YWRtaW4=