diff --git a/.gitignore b/.gitignore
index c83ef97..12e78ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ build
 export
 mobsos-data-processing/output
 etc/launcher-configuration.ini
+app/output/*
diff --git a/mobsos-data-processing/build.gradle b/app/build.gradle
similarity index 100%
rename from mobsos-data-processing/build.gradle
rename to app/build.gradle
diff --git a/mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingService.java b/app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingService.java
similarity index 100%
rename from mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingService.java
rename to app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingService.java
diff --git a/mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MonitoringMessageWithEncryptedAgents.java b/app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MonitoringMessageWithEncryptedAgents.java
similarity index 100%
rename from mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MonitoringMessageWithEncryptedAgents.java
rename to app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/MonitoringMessageWithEncryptedAgents.java
diff --git a/mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseInsertStatement.java b/app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseInsertStatement.java
similarity index 100%
rename from mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseInsertStatement.java
rename to app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseInsertStatement.java
diff --git a/mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseQuery.java b/app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseQuery.java
similarity index 100%
rename from mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseQuery.java
rename to app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/DatabaseQuery.java
diff --git a/mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabase.java b/app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabase.java
similarity index 100%
rename from mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabase.java
rename to app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabase.java
diff --git a/mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabaseType.java b/app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabaseType.java
similarity index 100%
rename from mobsos-data-processing/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabaseType.java
rename to app/src/main/java/i5/las2peer/services/mobsos/dataProcessing/database/SQLDatabaseType.java
diff --git a/mobsos-data-processing/src/test/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingServiceTest.java b/app/src/test/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingServiceTest.java
similarity index 100%
rename from mobsos-data-processing/src/test/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingServiceTest.java
rename to app/src/test/java/i5/las2peer/services/mobsos/dataProcessing/MobSOSDataProcessingServiceTest.java
diff --git a/settings.gradle b/settings.gradle
index 888a5dd..253b706 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,4 +8,4 @@
  */
 
 rootProject.name = 'mobsos-data-processing'
-include('mobsos-data-processing')
\ No newline at end of file
+include('app')
\ No newline at end of file