diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java
index d48a93fb2f5ff26163601f51385374406e650822..932e39c3a05574aafeeb839a2da41c373df8b8d3 100644
--- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java
+++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java
@@ -9,9 +9,11 @@ import javax.annotation.PostConstruct;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import de.fhmuenster.masterthesis.Testgenerator.rest.dto.MigrationResultWrapperDTO;
+import de.fhmuenster.masterthesis.Testgenerator.rest.service.change.ChangeService;
 import de.fhmuenster.masterthesis.Testgenerator.yaml.MigrationResultStatus;
 import de.fhmuenster.masterthesis.Testgenerator.yaml.MigrationYaml;
 import de.fhmuenster.masterthesis.Testgenerator.yaml.YamlReader;
@@ -34,6 +36,9 @@ public class MigrationService {
 	
 	private MigrationYaml yaml;
 	
+	@Autowired
+	private ChangeService changeService;
+	
 	public MigrationService() {
 	}
 	
@@ -65,10 +70,20 @@ public class MigrationService {
 	
 	private List<FlowChangeWrapper> detectActivityAddActions(List<Flow> oldFlows, List<Flow> newFlows) {
 		List<FlowChangeWrapper> result = new ArrayList<>();
+		
+		//Flow Matching
+		Flow [][] matchingFlows = this.changeService.compareFlows(newFlows, oldFlows);
+		
+		for(int i=0; i < matchingFlows.length; i++) {
+			result.addAll(compareFlowsForAddAction(matchingFlows[i][1], matchingFlows[i][0]));
+		}
+		
 		//Flows miteinander vergleichen
+		/*
 		for(int i=0; i < oldFlows.size(); i++) {
 			result.addAll(compareFlowsForAddAction(oldFlows.get(i), newFlows.get(i)));
 		}
+		*/
 		
 		return result;
 	}
diff --git a/testgenerator-web/testgenerator-web/src/app/app-routing.module.ts b/testgenerator-web/testgenerator-web/src/app/app-routing.module.ts
index 6b34003b7744d128ac86e531a2080cdb15c98352..d47aafc67706640a512b32be088991e329b06a66 100644
--- a/testgenerator-web/testgenerator-web/src/app/app-routing.module.ts
+++ b/testgenerator-web/testgenerator-web/src/app/app-routing.module.ts
@@ -16,7 +16,7 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje
 import { LoopsComponent } from './components/loops/loops.component';
 import { LoopComponent } from './components/loop/loop.component';
 import { UpdateProjectComponent } from './components/update-project/update-project.component';
-import { MigrationOverviewComponent } from './migration-overview/migration-overview.component';
+import { MigrationOverviewComponent } from './components/migration-overview/migration-overview.component';
 
 
 const routes: Routes = [
diff --git a/testgenerator-web/testgenerator-web/src/app/app.module.ts b/testgenerator-web/testgenerator-web/src/app/app.module.ts
index 0fe153006afd0bb80fbc46add660cd77b668db5f..015a77f4c8fad5baca81f563ec59a10eab2e7c8a 100644
--- a/testgenerator-web/testgenerator-web/src/app/app.module.ts
+++ b/testgenerator-web/testgenerator-web/src/app/app.module.ts
@@ -30,7 +30,7 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje
 import { LoopsComponent } from './components/loops/loops.component';
 import { LoopComponent } from './components/loop/loop.component';
 import { UpdateProjectComponent } from './components/update-project/update-project.component';
-import { MigrationOverviewComponent } from './migration-overview/migration-overview.component';
+import { MigrationOverviewComponent } from './components/migration-overview/migration-overview.component';
 
 @NgModule({
   declarations: [
diff --git a/testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.css b/testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.css
similarity index 100%
rename from testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.css
rename to testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.css
diff --git a/testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.html b/testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.html
similarity index 100%
rename from testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.html
rename to testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.html
diff --git a/testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.spec.ts b/testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.spec.ts
similarity index 100%
rename from testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.spec.ts
rename to testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.spec.ts
diff --git a/testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.ts b/testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.ts
similarity index 85%
rename from testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.ts
rename to testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.ts
index a0aec047820e5814dc080a2c54b190734535c44a..ca40a67be0438d83f52853aee7e3c174e151cbae 100644
--- a/testgenerator-web/testgenerator-web/src/app/migration-overview/migration-overview.component.ts
+++ b/testgenerator-web/testgenerator-web/src/app/components/migration-overview/migration-overview.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { MigrationResultWrapper } from '../models/migration-result-wrapper';
-import { MigrationService } from '../services/migration-service';
+import { MigrationResultWrapper } from '../../models/migration-result-wrapper';
+import { MigrationService } from '../../services/migration-service';
 
 @Component({
   selector: 'app-migration-overview',