diff --git a/.gitignore b/.gitignore
index 7de5fc2c4b88652eea9f2190b8a4a3c01495cb9b..cdff0bf46977a6a2055f0f613dd12dcff9118344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,10 @@ certs/
*.db
*.iml
-build/[0-9]*.[0-9]*.[0-9]*
+*/build/[0-9]*.[0-9]*.[0-9]*
/error.log
/application.properties
-src/main/WEB-INF
-src/main/META-INF
+**/main/WEB-INF
+**/main/META-INF
/screenshots/
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0c6715f2fbf5fc734d4a485844f07d773a3c34f1
--- /dev/null
+++ b/BudgetMasterServer/pom.xml
@@ -0,0 +1,337 @@
+<?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">
+ <parent>
+ <artifactId>BudgetMaster</artifactId>
+ <groupId>de.deadlocker8</groupId>
+ <version>2.10.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>BudgetMasterServer</artifactId>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>de.thecodelabs</groupId>
+ <artifactId>jlibs</artifactId>
+ <version>${jlibs.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <properties>
+ <jlibs.version>3.2.0</jlibs.version>
+ <versionizer.version>3.0.1</versionizer.version>
+ <webjars-locator.version>0.42</webjars-locator.version>
+ <jquery.version>3.6.0</jquery.version>
+ <materializecss.version>1.0.0</materializecss.version>
+ <fontawesome.version>6.0.0</fontawesome.version>
+ <sortablejs.version>1.14.0</sortablejs.version>
+ <mousetrap.version>1.6.5</mousetrap.version>
+ <codemirror.version>5.62.2</codemirror.version>
+ <selenium.version>4.1.2</selenium.version>
+ <assertj-core.version>3.22.0</assertj-core.version>
+ <jgit.version>6.0.0.202111291000-r</jgit.version>
+ <natorder.version>1.1.2</natorder.version>
+ <h2database.version>1.4.199</h2database.version>
+ <itextpdf.version>5.5.13.2</itextpdf.version>
+ <vanilla-picker.version>2.12.1</vanilla-picker.version>
+ <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+ <dependency-check-maven.version>6.5.3</dependency-check-maven.version>
+ <testcontainer.version>1.16.3</testcontainer.version>
+
+ <project.outputDirectory>build/${project.version}</project.outputDirectory>
+ <project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-freemarker</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.thecodelabs</groupId>
+ <artifactId>libUtils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.thecodelabs</groupId>
+ <artifactId>libStorage</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.thecodelabs.versionizer</groupId>
+ <artifactId>api</artifactId>
+ <version>${versionizer.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>de.thecodelabs</groupId>
+ <artifactId>libLogger-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2database.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>${itextpdf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>${jgit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.padler</groupId>
+ <artifactId>natorder</artifactId>
+ <version>${natorder.version}</version>
+ </dependency>
+
+ <!--Webjars-->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>webjars-locator</artifactId>
+ <version>${webjars-locator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>${jquery.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>materializecss</artifactId>
+ <version>${materializecss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>font-awesome</artifactId>
+ <version>${fontawesome.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>sortablejs</artifactId>
+ <version>${sortablejs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>mousetrap</artifactId>
+ <version>${mousetrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>${codemirror.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>vanilla-picker</artifactId>
+ <version>${vanilla-picker.version}</version>
+ </dependency>
+
+
+ <!-- selenium -->
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-api</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-firefox-driver</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-support</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj-core.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${testcontainer.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${testcontainer.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${project.outputDirectory}</outputDirectory>
+ <finalName>${project.artifactName}</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.2</version>
+ <configuration>
+ <webappDirectory>${basedir}/src/main</webappDirectory>
+ <outputDirectory>${project.outputDirectory}</outputDirectory>
+ <warName>${project.artifactName}</warName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>war-packaging</id>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ <configuration>
+ <junitArtifactName>junit:junit</junitArtifactName>
+ <argLine>${surefireArgLine} -Dfile.encoding=UTF-8</argLine>
+
+ <systemPropertyVariables>
+ <testProfile>true</testProfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>aggregate-reports-all</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <title>BudgetMaster Code Coverage</title>
+ </configuration>
+ </execution>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${dependency-check-maven.version}</version>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>false</skip>
+ <cveValidForHours>48</cveValidForHours>
+ <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+ <failOnError>false</failOnError>
+ <formats>
+ <format>HTML</format>
+ <format>XML</format>
+ </formats>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/src/main/java/de/deadlocker8/budgetmaster/Build.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Build.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/Build.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Build.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/Main.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Main.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/Main.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Main.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/RunMode.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/RunMode.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/RunMode.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/RunMode.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountState.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountState.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/AccountState.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountState.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/BuildAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/BuildAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/BuildAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/BuildAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/CalendarAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/CalendarAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/CalendarAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/CalendarAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/ColorAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/ColorAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/ColorAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/ColorAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/GlobalControllerAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/GlobalControllerAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/GlobalControllerAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/GlobalControllerAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/NotificationAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/NotificationAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/NotificationAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/NotificationAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/ServiceAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/ServiceAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/ServiceAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/ServiceAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/StaticClassesAdvice.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/StaticClassesAdvice.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/advices/StaticClassesAdvice.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/advices/StaticClassesAdvice.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/User.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/UserRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/UserRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/UserRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebMvcConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebMvcConfiguration.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/WebMvcConfiguration.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebMvcConfiguration.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupTime.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupTime.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupTime.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupTime.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/BackupService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/BackupService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/BackupStatus.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupStatus.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/BackupStatus.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupStatus.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupException.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupException.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupException.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupException.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupTask.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupTask.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupTask.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/GitBackupTask.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/GitHelper.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/GitHelper.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/GitHelper.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/GitHelper.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/LocalBackupTask.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/LocalBackupTask.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/LocalBackupTask.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/LocalBackupTask.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/LocalGitBackupTask.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/LocalGitBackupTask.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/LocalGitBackupTask.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/LocalGitBackupTask.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/CategoryRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/CategoryType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/CategoryValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/DestinationCategory.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/DestinationCategory.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/categories/DestinationCategory.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/DestinationCategory.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartDisplayType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartDisplayType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartDisplayType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartDisplayType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartGroupType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartGroupType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartGroupType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartGroupType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/ChartValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/TeapotController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/TeapotController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/controller/TeapotController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/TeapotController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/BackupItemParser.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/BackupItemParser.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/BackupItemParser.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/BackupItemParser.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v6.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v6.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v6.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v6.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v7.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v7.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v7.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v7.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v8.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v8.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v8.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v8.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/JSONIdentifier.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/JSONIdentifier.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/JSONIdentifier.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/JSONIdentifier.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatchList.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatchList.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatchList.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatchList.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupInfo.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupInfo.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/BackupInfo.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupInfo.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/Upgradeable.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/Upgradeable.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/Upgradeable.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/Upgradeable.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/IconConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/IconConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/IconConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/IconConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateGroupConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateGroupConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateGroupConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateGroupConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupAccount_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupAccount_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupAccount_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupAccount_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupCategory_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupCategory_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupCategory_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupCategory_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingEndOption_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingEndOption_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingEndOption_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingEndOption_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingModifier_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingModifier_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingModifier_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingModifier_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingOption_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingOption_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingOption_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingOption_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTag_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTag_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTag_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTag_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTemplate_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTemplate_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTemplate_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTemplate_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransactionBase_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransactionBase_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransactionBase_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransactionBase_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransaction_v4.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransaction_v4.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransaction_v4.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupTransaction_v4.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupAccount_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupAccount_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupAccount_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupAccount_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupCategory_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupCategory_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupCategory_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupCategory_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupChart_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupChart_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupChart_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupChart_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupImage_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupImage_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupImage_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupImage_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTemplate_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTemplate_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTemplate_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTemplate_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTransaction_v5.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTransaction_v5.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTransaction_v5.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTransaction_v5.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupAccount_v6.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupAccount_v6.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupAccount_v6.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupAccount_v6.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTemplate_v6.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTemplate_v6.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTemplate_v6.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTemplate_v6.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTransaction_v6.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTransaction_v6.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTransaction_v6.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupTransaction_v6.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupAccount_v7.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupAccount_v7.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupAccount_v7.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupAccount_v7.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupCategory_v7.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupCategory_v7.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupCategory_v7.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupCategory_v7.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupDatabase_v7.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupDatabase_v7.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupDatabase_v7.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupDatabase_v7.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupIcon_v7.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupIcon_v7.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupIcon_v7.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupIcon_v7.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupTemplate_v7.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupTemplate_v7.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupTemplate_v7.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v7/BackupTemplate_v7.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupDatabase_v8.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupDatabase_v8.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupDatabase_v8.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupDatabase_v8.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupIcon_v8.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupIcon_v8.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupIcon_v8.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupIcon_v8.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplateGroup_v8.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplateGroup_v8.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplateGroup_v8.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplateGroup_v8.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplate_v8.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplate_v8.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplate_v8.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/v8/BackupTemplate_v8.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/filter/FilterConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterConfiguration.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/filter/FilterConfiguration.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterConfiguration.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/filter/FilterObject.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterObject.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/filter/FilterObject.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterObject.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hints/HintController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/HintController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hints/HintController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/HintController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hints/HintRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/HintRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hints/HintRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/HintRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GeneralHotKey.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GlobalDatePickerHotKey.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GlobalDatePickerHotKey.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hotkeys/GlobalDatePickerHotKey.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/GlobalDatePickerHotKey.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKey.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKey.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKey.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKey.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKeysController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKeysController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKeysController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hotkeys/HotKeysController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/icon/IconRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/IconRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/icon/IconRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/IconRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/icon/IconService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/IconService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/icon/IconService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/IconService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/Image.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/images/Image.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/ImageRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/images/ImageRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/ImageRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/InvalidFileExtensionException.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/InvalidFileExtensionException.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/images/InvalidFileExtensionException.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/InvalidFileExtensionException.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/AmountType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/AmountType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/AmountType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/AmountType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/Fonts.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Fonts.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/Fonts.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Fonts.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/HeaderFooterPageEvent.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/HeaderFooterPageEvent.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/HeaderFooterPageEvent.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/HeaderFooterPageEvent.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudget.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudget.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudget.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudget.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudgetHandler.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudgetHandler.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudgetHandler.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/categoryBudget/CategoryBudgetHandler.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/search/Search.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/search/Search.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/search/Search.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/search/Search.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/search/SearchController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/search/SearchController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/search/SearchController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/search/SearchController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/AccessAllEntities.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/AccessAllEntities.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/AccessAllEntities.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/AccessAllEntities.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/AccessEntityByID.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/AccessEntityByID.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/AccessEntityByID.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/AccessEntityByID.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateFormatStyle.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/DateService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/DateService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticItem.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticItem.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticItem.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticItem.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticsService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticsService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/statistics/StatisticsService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/tags/TagController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/Tag_.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag_.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/tags/Tag_.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag_.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateModelAttributes.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateModelAttributes.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templates/TemplateModelAttributes.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateModelAttributes.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionValidator.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionValidator.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionValidator.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionValidator.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/ArtifactBean.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/ArtifactBean.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/update/ArtifactBean.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/ArtifactBean.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/IsExeFileHook.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/IsExeFileHook.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/update/IsExeFileHook.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/IsExeFileHook.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/IsJarFileHook.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/IsJarFileHook.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/update/IsJarFileHook.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/IsJarFileHook.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/UpdateAvailableEvent.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/UpdateAvailableEvent.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/update/UpdateAvailableEvent.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/UpdateAvailableEvent.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/FontAwesomeIcons.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/FontAwesomeIcons.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/FontAwesomeIcons.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/FontAwesomeIcons.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/LocalizedEnum.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/LocalizedEnum.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/LocalizedEnum.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/LocalizedEnum.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Mappings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Mappings.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/Mappings.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Mappings.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/ProvidesID.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/ProvidesID.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/ProvidesID.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/ProvidesID.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/ResourceNotFoundException.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/ResourceNotFoundException.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/ResourceNotFoundException.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/ResourceNotFoundException.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/WebRequestUtils.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/WebRequestUtils.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/WebRequestUtils.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/WebRequestUtils.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/EnsureAllIconizableHaveAnIconInstance.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/EnsureAllIconizableHaveAnIconInstance.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/EnsureAllIconizableHaveAnIconInstance.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/EnsureAllIconizableHaveAnIconInstance.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/UpdateInstalledVersion.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/UpdateInstalledVersion.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/UpdateInstalledVersion.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/UpdateInstalledVersion.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/notification/Notification.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/Notification.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/notification/Notification.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/Notification.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationType.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationType.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationType.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java
similarity index 100%
rename from src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java
diff --git a/src/main/resources/application.properties b/BudgetMasterServer/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to BudgetMasterServer/src/main/resources/application.properties
diff --git a/src/main/resources/charts/AccountSumPerDay.js b/BudgetMasterServer/src/main/resources/charts/AccountSumPerDay.js
similarity index 100%
rename from src/main/resources/charts/AccountSumPerDay.js
rename to BudgetMasterServer/src/main/resources/charts/AccountSumPerDay.js
diff --git a/src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerCategoryBar.js b/BudgetMasterServer/src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerCategoryBar.js
similarity index 100%
rename from src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerCategoryBar.js
rename to BudgetMasterServer/src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerCategoryBar.js
diff --git a/src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerYearBar.js b/BudgetMasterServer/src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerYearBar.js
similarity index 100%
rename from src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerYearBar.js
rename to BudgetMasterServer/src/main/resources/charts/AverageMonthlyIncomesAndExpendituresPerYearBar.js
diff --git a/src/main/resources/charts/AverageTransactionAmountPerCategoryBar.js b/BudgetMasterServer/src/main/resources/charts/AverageTransactionAmountPerCategoryBar.js
similarity index 100%
rename from src/main/resources/charts/AverageTransactionAmountPerCategoryBar.js
rename to BudgetMasterServer/src/main/resources/charts/AverageTransactionAmountPerCategoryBar.js
diff --git a/src/main/resources/charts/Default.js b/BudgetMasterServer/src/main/resources/charts/Default.js
similarity index 100%
rename from src/main/resources/charts/Default.js
rename to BudgetMasterServer/src/main/resources/charts/Default.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresPerYearBar.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js b/BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js
similarity index 100%
rename from src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js
rename to BudgetMasterServer/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js
diff --git a/src/main/resources/charts/RestPerMonth.js b/BudgetMasterServer/src/main/resources/charts/RestPerMonth.js
similarity index 100%
rename from src/main/resources/charts/RestPerMonth.js
rename to BudgetMasterServer/src/main/resources/charts/RestPerMonth.js
diff --git a/src/main/resources/config/libLogger.yml b/BudgetMasterServer/src/main/resources/config/libLogger.yml
similarity index 100%
rename from src/main/resources/config/libLogger.yml
rename to BudgetMasterServer/src/main/resources/config/libLogger.yml
diff --git a/src/main/resources/config/templates/settings-docker.properties b/BudgetMasterServer/src/main/resources/config/templates/settings-docker.properties
similarity index 100%
rename from src/main/resources/config/templates/settings-docker.properties
rename to BudgetMasterServer/src/main/resources/config/templates/settings-docker.properties
diff --git a/src/main/resources/config/templates/settings.properties b/BudgetMasterServer/src/main/resources/config/templates/settings.properties
similarity index 100%
rename from src/main/resources/config/templates/settings.properties
rename to BudgetMasterServer/src/main/resources/config/templates/settings.properties
diff --git a/src/main/resources/favicon.ico b/BudgetMasterServer/src/main/resources/favicon.ico
similarity index 100%
rename from src/main/resources/favicon.ico
rename to BudgetMasterServer/src/main/resources/favicon.ico
diff --git a/src/main/resources/fonts/OpenSans-Regular.ttf b/BudgetMasterServer/src/main/resources/fonts/OpenSans-Regular.ttf
similarity index 100%
rename from src/main/resources/fonts/OpenSans-Regular.ttf
rename to BudgetMasterServer/src/main/resources/fonts/OpenSans-Regular.ttf
diff --git a/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
similarity index 100%
rename from src/main/resources/languages/base_de.properties
rename to BudgetMasterServer/src/main/resources/languages/base_de.properties
diff --git a/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
similarity index 100%
rename from src/main/resources/languages/base_en.properties
rename to BudgetMasterServer/src/main/resources/languages/base_en.properties
diff --git a/src/main/resources/languages/hints_de.properties b/BudgetMasterServer/src/main/resources/languages/hints_de.properties
similarity index 100%
rename from src/main/resources/languages/hints_de.properties
rename to BudgetMasterServer/src/main/resources/languages/hints_de.properties
diff --git a/src/main/resources/languages/hints_en.properties b/BudgetMasterServer/src/main/resources/languages/hints_en.properties
similarity index 100%
rename from src/main/resources/languages/hints_en.properties
rename to BudgetMasterServer/src/main/resources/languages/hints_en.properties
diff --git a/src/main/resources/languages/news_de.properties b/BudgetMasterServer/src/main/resources/languages/news_de.properties
similarity index 100%
rename from src/main/resources/languages/news_de.properties
rename to BudgetMasterServer/src/main/resources/languages/news_de.properties
diff --git a/src/main/resources/languages/news_en.properties b/BudgetMasterServer/src/main/resources/languages/news_en.properties
similarity index 100%
rename from src/main/resources/languages/news_en.properties
rename to BudgetMasterServer/src/main/resources/languages/news_en.properties
diff --git a/src/main/resources/repositories.json b/BudgetMasterServer/src/main/resources/repositories.json
similarity index 100%
rename from src/main/resources/repositories.json
rename to BudgetMasterServer/src/main/resources/repositories.json
diff --git a/src/main/resources/static/css/accounts.css b/BudgetMasterServer/src/main/resources/static/css/accounts.css
similarity index 100%
rename from src/main/resources/static/css/accounts.css
rename to BudgetMasterServer/src/main/resources/static/css/accounts.css
diff --git a/src/main/resources/static/css/categories.css b/BudgetMasterServer/src/main/resources/static/css/categories.css
similarity index 100%
rename from src/main/resources/static/css/categories.css
rename to BudgetMasterServer/src/main/resources/static/css/categories.css
diff --git a/src/main/resources/static/css/charts.css b/BudgetMasterServer/src/main/resources/static/css/charts.css
similarity index 100%
rename from src/main/resources/static/css/charts.css
rename to BudgetMasterServer/src/main/resources/static/css/charts.css
diff --git a/src/main/resources/static/css/collapsible.css b/BudgetMasterServer/src/main/resources/static/css/collapsible.css
similarity index 100%
rename from src/main/resources/static/css/collapsible.css
rename to BudgetMasterServer/src/main/resources/static/css/collapsible.css
diff --git a/src/main/resources/static/css/colors.css b/BudgetMasterServer/src/main/resources/static/css/colors.css
similarity index 100%
rename from src/main/resources/static/css/colors.css
rename to BudgetMasterServer/src/main/resources/static/css/colors.css
diff --git a/src/main/resources/static/css/customSelect.css b/BudgetMasterServer/src/main/resources/static/css/customSelect.css
similarity index 100%
rename from src/main/resources/static/css/customSelect.css
rename to BudgetMasterServer/src/main/resources/static/css/customSelect.css
diff --git a/src/main/resources/static/css/datepicker.css b/BudgetMasterServer/src/main/resources/static/css/datepicker.css
similarity index 100%
rename from src/main/resources/static/css/datepicker.css
rename to BudgetMasterServer/src/main/resources/static/css/datepicker.css
diff --git a/src/main/resources/static/css/globalDatepicker.css b/BudgetMasterServer/src/main/resources/static/css/globalDatepicker.css
similarity index 100%
rename from src/main/resources/static/css/globalDatepicker.css
rename to BudgetMasterServer/src/main/resources/static/css/globalDatepicker.css
diff --git a/src/main/resources/static/css/hotkeys.css b/BudgetMasterServer/src/main/resources/static/css/hotkeys.css
similarity index 100%
rename from src/main/resources/static/css/hotkeys.css
rename to BudgetMasterServer/src/main/resources/static/css/hotkeys.css
diff --git a/src/main/resources/static/css/iconSelect.css b/BudgetMasterServer/src/main/resources/static/css/iconSelect.css
similarity index 100%
rename from src/main/resources/static/css/iconSelect.css
rename to BudgetMasterServer/src/main/resources/static/css/iconSelect.css
diff --git a/src/main/resources/static/css/login.css b/BudgetMasterServer/src/main/resources/static/css/login.css
similarity index 100%
rename from src/main/resources/static/css/login.css
rename to BudgetMasterServer/src/main/resources/static/css/login.css
diff --git a/src/main/resources/static/css/navbar.css b/BudgetMasterServer/src/main/resources/static/css/navbar.css
similarity index 100%
rename from src/main/resources/static/css/navbar.css
rename to BudgetMasterServer/src/main/resources/static/css/navbar.css
diff --git a/src/main/resources/static/css/reports.css b/BudgetMasterServer/src/main/resources/static/css/reports.css
similarity index 100%
rename from src/main/resources/static/css/reports.css
rename to BudgetMasterServer/src/main/resources/static/css/reports.css
diff --git a/src/main/resources/static/css/search.css b/BudgetMasterServer/src/main/resources/static/css/search.css
similarity index 100%
rename from src/main/resources/static/css/search.css
rename to BudgetMasterServer/src/main/resources/static/css/search.css
diff --git a/src/main/resources/static/css/settings.css b/BudgetMasterServer/src/main/resources/static/css/settings.css
similarity index 100%
rename from src/main/resources/static/css/settings.css
rename to BudgetMasterServer/src/main/resources/static/css/settings.css
diff --git a/src/main/resources/static/css/style.css b/BudgetMasterServer/src/main/resources/static/css/style.css
similarity index 100%
rename from src/main/resources/static/css/style.css
rename to BudgetMasterServer/src/main/resources/static/css/style.css
diff --git a/src/main/resources/static/css/templates.css b/BudgetMasterServer/src/main/resources/static/css/templates.css
similarity index 100%
rename from src/main/resources/static/css/templates.css
rename to BudgetMasterServer/src/main/resources/static/css/templates.css
diff --git a/src/main/resources/static/css/transactions.css b/BudgetMasterServer/src/main/resources/static/css/transactions.css
similarity index 100%
rename from src/main/resources/static/css/transactions.css
rename to BudgetMasterServer/src/main/resources/static/css/transactions.css
diff --git a/src/main/resources/static/favicon.ico b/BudgetMasterServer/src/main/resources/static/favicon.ico
similarity index 100%
rename from src/main/resources/static/favicon.ico
rename to BudgetMasterServer/src/main/resources/static/favicon.ico
diff --git a/src/main/resources/static/images/Logo_3000x3000.png b/BudgetMasterServer/src/main/resources/static/images/Logo_3000x3000.png
similarity index 100%
rename from src/main/resources/static/images/Logo_3000x3000.png
rename to BudgetMasterServer/src/main/resources/static/images/Logo_3000x3000.png
diff --git a/src/main/resources/static/images/Logo_with_text_full_res.png b/BudgetMasterServer/src/main/resources/static/images/Logo_with_text_full_res.png
similarity index 100%
rename from src/main/resources/static/images/Logo_with_text_full_res.png
rename to BudgetMasterServer/src/main/resources/static/images/Logo_with_text_full_res.png
diff --git a/src/main/resources/static/images/Logo_with_text_medium_res.png b/BudgetMasterServer/src/main/resources/static/images/Logo_with_text_medium_res.png
similarity index 100%
rename from src/main/resources/static/images/Logo_with_text_medium_res.png
rename to BudgetMasterServer/src/main/resources/static/images/Logo_with_text_medium_res.png
diff --git a/src/main/resources/static/images/Logo_with_white_text_full_res.png b/BudgetMasterServer/src/main/resources/static/images/Logo_with_white_text_full_res.png
similarity index 100%
rename from src/main/resources/static/images/Logo_with_white_text_full_res.png
rename to BudgetMasterServer/src/main/resources/static/images/Logo_with_white_text_full_res.png
diff --git a/src/main/resources/static/images/Logo_with_white_text_medium_res.png b/BudgetMasterServer/src/main/resources/static/images/Logo_with_white_text_medium_res.png
similarity index 100%
rename from src/main/resources/static/images/Logo_with_white_text_medium_res.png
rename to BudgetMasterServer/src/main/resources/static/images/Logo_with_white_text_medium_res.png
diff --git a/src/main/resources/static/images/charts/accountSumPerDay.png b/BudgetMasterServer/src/main/resources/static/images/charts/accountSumPerDay.png
similarity index 100%
rename from src/main/resources/static/images/charts/accountSumPerDay.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/accountSumPerDay.png
diff --git a/src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerCategoryBar.png b/BudgetMasterServer/src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerCategoryBar.png
similarity index 100%
rename from src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerCategoryBar.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerCategoryBar.png
diff --git a/src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerYearBar.png b/BudgetMasterServer/src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerYearBar.png
similarity index 100%
rename from src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerYearBar.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/averageMonthlyIncomesAndExpendituresPerYearBar.png
diff --git a/src/main/resources/static/images/charts/averageTransactionAmountPerCategory.png b/BudgetMasterServer/src/main/resources/static/images/charts/averageTransactionAmountPerCategory.png
similarity index 100%
rename from src/main/resources/static/images/charts/averageTransactionAmountPerCategory.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/averageTransactionAmountPerCategory.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresByCategoryBar.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresByCategoryBar.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresByCategoryBar.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresByCategoryBar.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresByCategoryPie.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresByCategoryPie.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresByCategoryPie.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresByCategoryPie.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthBar.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthBar.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresPerMonthBar.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthBar.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthByCategories.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthByCategories.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresPerMonthByCategories.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthByCategories.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthLine.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthLine.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresPerMonthLine.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerMonthLine.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresPerYearBar.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerYearBar.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresPerYearBar.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerYearBar.png
diff --git a/src/main/resources/static/images/charts/incomesAndExpendituresPerYearByCategories.png b/BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerYearByCategories.png
similarity index 100%
rename from src/main/resources/static/images/charts/incomesAndExpendituresPerYearByCategories.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/incomesAndExpendituresPerYearByCategories.png
diff --git a/src/main/resources/static/images/charts/placeholder.png b/BudgetMasterServer/src/main/resources/static/images/charts/placeholder.png
similarity index 100%
rename from src/main/resources/static/images/charts/placeholder.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/placeholder.png
diff --git a/src/main/resources/static/images/charts/restPerMonth.png b/BudgetMasterServer/src/main/resources/static/images/charts/restPerMonth.png
similarity index 100%
rename from src/main/resources/static/images/charts/restPerMonth.png
rename to BudgetMasterServer/src/main/resources/static/images/charts/restPerMonth.png
diff --git a/src/main/resources/static/images/teapot.png b/BudgetMasterServer/src/main/resources/static/images/teapot.png
similarity index 100%
rename from src/main/resources/static/images/teapot.png
rename to BudgetMasterServer/src/main/resources/static/images/teapot.png
diff --git a/src/main/resources/static/js/about.js b/BudgetMasterServer/src/main/resources/static/js/about.js
similarity index 100%
rename from src/main/resources/static/js/about.js
rename to BudgetMasterServer/src/main/resources/static/js/about.js
diff --git a/src/main/resources/static/js/accounts.js b/BudgetMasterServer/src/main/resources/static/js/accounts.js
similarity index 100%
rename from src/main/resources/static/js/accounts.js
rename to BudgetMasterServer/src/main/resources/static/js/accounts.js
diff --git a/src/main/resources/static/js/categories.js b/BudgetMasterServer/src/main/resources/static/js/categories.js
similarity index 100%
rename from src/main/resources/static/js/categories.js
rename to BudgetMasterServer/src/main/resources/static/js/categories.js
diff --git a/src/main/resources/static/js/charts.js b/BudgetMasterServer/src/main/resources/static/js/charts.js
similarity index 100%
rename from src/main/resources/static/js/charts.js
rename to BudgetMasterServer/src/main/resources/static/js/charts.js
diff --git a/src/main/resources/static/js/customSelect.js b/BudgetMasterServer/src/main/resources/static/js/customSelect.js
similarity index 100%
rename from src/main/resources/static/js/customSelect.js
rename to BudgetMasterServer/src/main/resources/static/js/customSelect.js
diff --git a/src/main/resources/static/js/fetchModalContent.js b/BudgetMasterServer/src/main/resources/static/js/fetchModalContent.js
similarity index 100%
rename from src/main/resources/static/js/fetchModalContent.js
rename to BudgetMasterServer/src/main/resources/static/js/fetchModalContent.js
diff --git a/src/main/resources/static/js/filter.js b/BudgetMasterServer/src/main/resources/static/js/filter.js
similarity index 100%
rename from src/main/resources/static/js/filter.js
rename to BudgetMasterServer/src/main/resources/static/js/filter.js
diff --git a/src/main/resources/static/js/fontColorPicker.js b/BudgetMasterServer/src/main/resources/static/js/fontColorPicker.js
similarity index 100%
rename from src/main/resources/static/js/fontColorPicker.js
rename to BudgetMasterServer/src/main/resources/static/js/fontColorPicker.js
diff --git a/src/main/resources/static/js/globalDatePicker.js b/BudgetMasterServer/src/main/resources/static/js/globalDatePicker.js
similarity index 100%
rename from src/main/resources/static/js/globalDatePicker.js
rename to BudgetMasterServer/src/main/resources/static/js/globalDatePicker.js
diff --git a/src/main/resources/static/js/helpers.js b/BudgetMasterServer/src/main/resources/static/js/helpers.js
similarity index 100%
rename from src/main/resources/static/js/helpers.js
rename to BudgetMasterServer/src/main/resources/static/js/helpers.js
diff --git a/src/main/resources/static/js/hotkeys.js b/BudgetMasterServer/src/main/resources/static/js/hotkeys.js
similarity index 100%
rename from src/main/resources/static/js/hotkeys.js
rename to BudgetMasterServer/src/main/resources/static/js/hotkeys.js
diff --git a/src/main/resources/static/js/iconSelect.js b/BudgetMasterServer/src/main/resources/static/js/iconSelect.js
similarity index 100%
rename from src/main/resources/static/js/iconSelect.js
rename to BudgetMasterServer/src/main/resources/static/js/iconSelect.js
diff --git a/src/main/resources/static/js/import.js b/BudgetMasterServer/src/main/resources/static/js/import.js
similarity index 100%
rename from src/main/resources/static/js/import.js
rename to BudgetMasterServer/src/main/resources/static/js/import.js
diff --git a/src/main/resources/static/js/libs/moment.min.js b/BudgetMasterServer/src/main/resources/static/js/libs/moment.min.js
similarity index 100%
rename from src/main/resources/static/js/libs/moment.min.js
rename to BudgetMasterServer/src/main/resources/static/js/libs/moment.min.js
diff --git a/src/main/resources/static/js/libs/plotly.min.js b/BudgetMasterServer/src/main/resources/static/js/libs/plotly.min.js
similarity index 100%
rename from src/main/resources/static/js/libs/plotly.min.js
rename to BudgetMasterServer/src/main/resources/static/js/libs/plotly.min.js
diff --git a/src/main/resources/static/js/main.js b/BudgetMasterServer/src/main/resources/static/js/main.js
similarity index 100%
rename from src/main/resources/static/js/main.js
rename to BudgetMasterServer/src/main/resources/static/js/main.js
diff --git a/src/main/resources/static/js/reports.js b/BudgetMasterServer/src/main/resources/static/js/reports.js
similarity index 100%
rename from src/main/resources/static/js/reports.js
rename to BudgetMasterServer/src/main/resources/static/js/reports.js
diff --git a/src/main/resources/static/js/search.js b/BudgetMasterServer/src/main/resources/static/js/search.js
similarity index 100%
rename from src/main/resources/static/js/search.js
rename to BudgetMasterServer/src/main/resources/static/js/search.js
diff --git a/src/main/resources/static/js/settings.js b/BudgetMasterServer/src/main/resources/static/js/settings.js
similarity index 100%
rename from src/main/resources/static/js/settings.js
rename to BudgetMasterServer/src/main/resources/static/js/settings.js
diff --git a/src/main/resources/static/js/templateGroups.js b/BudgetMasterServer/src/main/resources/static/js/templateGroups.js
similarity index 100%
rename from src/main/resources/static/js/templateGroups.js
rename to BudgetMasterServer/src/main/resources/static/js/templateGroups.js
diff --git a/src/main/resources/static/js/templates.js b/BudgetMasterServer/src/main/resources/static/js/templates.js
similarity index 100%
rename from src/main/resources/static/js/templates.js
rename to BudgetMasterServer/src/main/resources/static/js/templates.js
diff --git a/src/main/resources/static/js/transactionActions.js b/BudgetMasterServer/src/main/resources/static/js/transactionActions.js
similarity index 100%
rename from src/main/resources/static/js/transactionActions.js
rename to BudgetMasterServer/src/main/resources/static/js/transactionActions.js
diff --git a/src/main/resources/static/js/transactions.js b/BudgetMasterServer/src/main/resources/static/js/transactions.js
similarity index 100%
rename from src/main/resources/static/js/transactions.js
rename to BudgetMasterServer/src/main/resources/static/js/transactions.js
diff --git a/src/main/resources/static/touch_icon.png b/BudgetMasterServer/src/main/resources/static/touch_icon.png
similarity index 100%
rename from src/main/resources/static/touch_icon.png
rename to BudgetMasterServer/src/main/resources/static/touch_icon.png
diff --git a/src/main/resources/templates/about.ftl b/BudgetMasterServer/src/main/resources/templates/about.ftl
similarity index 100%
rename from src/main/resources/templates/about.ftl
rename to BudgetMasterServer/src/main/resources/templates/about.ftl
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
similarity index 100%
rename from src/main/resources/templates/accounts/accounts.ftl
rename to BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
diff --git a/src/main/resources/templates/accounts/deleteAccountModal.ftl b/BudgetMasterServer/src/main/resources/templates/accounts/deleteAccountModal.ftl
similarity index 100%
rename from src/main/resources/templates/accounts/deleteAccountModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/accounts/deleteAccountModal.ftl
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/BudgetMasterServer/src/main/resources/templates/accounts/newAccount.ftl
similarity index 100%
rename from src/main/resources/templates/accounts/newAccount.ftl
rename to BudgetMasterServer/src/main/resources/templates/accounts/newAccount.ftl
diff --git a/src/main/resources/templates/categories/categories.ftl b/BudgetMasterServer/src/main/resources/templates/categories/categories.ftl
similarity index 100%
rename from src/main/resources/templates/categories/categories.ftl
rename to BudgetMasterServer/src/main/resources/templates/categories/categories.ftl
diff --git a/src/main/resources/templates/categories/categoriesFunctions.ftl b/BudgetMasterServer/src/main/resources/templates/categories/categoriesFunctions.ftl
similarity index 100%
rename from src/main/resources/templates/categories/categoriesFunctions.ftl
rename to BudgetMasterServer/src/main/resources/templates/categories/categoriesFunctions.ftl
diff --git a/src/main/resources/templates/categories/deleteCategoryModal.ftl b/BudgetMasterServer/src/main/resources/templates/categories/deleteCategoryModal.ftl
similarity index 100%
rename from src/main/resources/templates/categories/deleteCategoryModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/categories/deleteCategoryModal.ftl
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/BudgetMasterServer/src/main/resources/templates/categories/newCategory.ftl
similarity index 100%
rename from src/main/resources/templates/categories/newCategory.ftl
rename to BudgetMasterServer/src/main/resources/templates/categories/newCategory.ftl
diff --git a/src/main/resources/templates/charts/chartFunctions.ftl b/BudgetMasterServer/src/main/resources/templates/charts/chartFunctions.ftl
similarity index 100%
rename from src/main/resources/templates/charts/chartFunctions.ftl
rename to BudgetMasterServer/src/main/resources/templates/charts/chartFunctions.ftl
diff --git a/src/main/resources/templates/charts/charts.ftl b/BudgetMasterServer/src/main/resources/templates/charts/charts.ftl
similarity index 100%
rename from src/main/resources/templates/charts/charts.ftl
rename to BudgetMasterServer/src/main/resources/templates/charts/charts.ftl
diff --git a/src/main/resources/templates/charts/deleteChartModal.ftl b/BudgetMasterServer/src/main/resources/templates/charts/deleteChartModal.ftl
similarity index 100%
rename from src/main/resources/templates/charts/deleteChartModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/charts/deleteChartModal.ftl
diff --git a/src/main/resources/templates/charts/manage.ftl b/BudgetMasterServer/src/main/resources/templates/charts/manage.ftl
similarity index 100%
rename from src/main/resources/templates/charts/manage.ftl
rename to BudgetMasterServer/src/main/resources/templates/charts/manage.ftl
diff --git a/src/main/resources/templates/charts/newChart.ftl b/BudgetMasterServer/src/main/resources/templates/charts/newChart.ftl
similarity index 100%
rename from src/main/resources/templates/charts/newChart.ftl
rename to BudgetMasterServer/src/main/resources/templates/charts/newChart.ftl
diff --git a/src/main/resources/templates/error/400.ftl b/BudgetMasterServer/src/main/resources/templates/error/400.ftl
similarity index 100%
rename from src/main/resources/templates/error/400.ftl
rename to BudgetMasterServer/src/main/resources/templates/error/400.ftl
diff --git a/src/main/resources/templates/error/403.ftl b/BudgetMasterServer/src/main/resources/templates/error/403.ftl
similarity index 100%
rename from src/main/resources/templates/error/403.ftl
rename to BudgetMasterServer/src/main/resources/templates/error/403.ftl
diff --git a/src/main/resources/templates/error/404.ftl b/BudgetMasterServer/src/main/resources/templates/error/404.ftl
similarity index 100%
rename from src/main/resources/templates/error/404.ftl
rename to BudgetMasterServer/src/main/resources/templates/error/404.ftl
diff --git a/src/main/resources/templates/error/418.ftl b/BudgetMasterServer/src/main/resources/templates/error/418.ftl
similarity index 100%
rename from src/main/resources/templates/error/418.ftl
rename to BudgetMasterServer/src/main/resources/templates/error/418.ftl
diff --git a/src/main/resources/templates/error/500.ftl b/BudgetMasterServer/src/main/resources/templates/error/500.ftl
similarity index 100%
rename from src/main/resources/templates/error/500.ftl
rename to BudgetMasterServer/src/main/resources/templates/error/500.ftl
diff --git a/src/main/resources/templates/error/error.ftl b/BudgetMasterServer/src/main/resources/templates/error/error.ftl
similarity index 100%
rename from src/main/resources/templates/error/error.ftl
rename to BudgetMasterServer/src/main/resources/templates/error/error.ftl
diff --git a/src/main/resources/templates/filter/filterMacros.ftl b/BudgetMasterServer/src/main/resources/templates/filter/filterMacros.ftl
similarity index 100%
rename from src/main/resources/templates/filter/filterMacros.ftl
rename to BudgetMasterServer/src/main/resources/templates/filter/filterMacros.ftl
diff --git a/src/main/resources/templates/firstUse.ftl b/BudgetMasterServer/src/main/resources/templates/firstUse.ftl
similarity index 100%
rename from src/main/resources/templates/firstUse.ftl
rename to BudgetMasterServer/src/main/resources/templates/firstUse.ftl
diff --git a/src/main/resources/templates/globalAccountSelectModal.ftl b/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl
similarity index 100%
rename from src/main/resources/templates/globalAccountSelectModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl
diff --git a/src/main/resources/templates/helpers/availableImages.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/availableImages.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/availableImages.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/availableImages.ftl
diff --git a/src/main/resources/templates/helpers/customSelectMacros.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/customSelectMacros.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/customSelectMacros.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/customSelectMacros.ftl
diff --git a/src/main/resources/templates/helpers/fontColorPicker.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/fontColorPicker.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/fontColorPicker.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/fontColorPicker.ftl
diff --git a/src/main/resources/templates/helpers/globalDatePicker.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/globalDatePicker.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/globalDatePicker.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/globalDatePicker.ftl
diff --git a/src/main/resources/templates/helpers/header.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/header.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
diff --git a/src/main/resources/templates/helpers/iconSelect.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/iconSelect.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
diff --git a/src/main/resources/templates/helpers/navbar.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/navbar.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl
diff --git a/src/main/resources/templates/helpers/scripts.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/scripts.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl
diff --git a/src/main/resources/templates/helpers/validation.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/validation.ftl
similarity index 100%
rename from src/main/resources/templates/helpers/validation.ftl
rename to BudgetMasterServer/src/main/resources/templates/helpers/validation.ftl
diff --git a/src/main/resources/templates/hotkeys.ftl b/BudgetMasterServer/src/main/resources/templates/hotkeys.ftl
similarity index 100%
rename from src/main/resources/templates/hotkeys.ftl
rename to BudgetMasterServer/src/main/resources/templates/hotkeys.ftl
diff --git a/src/main/resources/templates/index.ftl b/BudgetMasterServer/src/main/resources/templates/index.ftl
similarity index 100%
rename from src/main/resources/templates/index.ftl
rename to BudgetMasterServer/src/main/resources/templates/index.ftl
diff --git a/src/main/resources/templates/indexFunctions.ftl b/BudgetMasterServer/src/main/resources/templates/indexFunctions.ftl
similarity index 100%
rename from src/main/resources/templates/indexFunctions.ftl
rename to BudgetMasterServer/src/main/resources/templates/indexFunctions.ftl
diff --git a/src/main/resources/templates/login.ftl b/BudgetMasterServer/src/main/resources/templates/login.ftl
similarity index 100%
rename from src/main/resources/templates/login.ftl
rename to BudgetMasterServer/src/main/resources/templates/login.ftl
diff --git a/src/main/resources/templates/reports/reports.ftl b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl
similarity index 100%
rename from src/main/resources/templates/reports/reports.ftl
rename to BudgetMasterServer/src/main/resources/templates/reports/reports.ftl
diff --git a/src/main/resources/templates/search/search.ftl b/BudgetMasterServer/src/main/resources/templates/search/search.ftl
similarity index 100%
rename from src/main/resources/templates/search/search.ftl
rename to BudgetMasterServer/src/main/resources/templates/search/search.ftl
diff --git a/src/main/resources/templates/search/searchMacros.ftl b/BudgetMasterServer/src/main/resources/templates/search/searchMacros.ftl
similarity index 100%
rename from src/main/resources/templates/search/searchMacros.ftl
rename to BudgetMasterServer/src/main/resources/templates/search/searchMacros.ftl
diff --git a/src/main/resources/templates/settings/importResult.ftl b/BudgetMasterServer/src/main/resources/templates/settings/importResult.ftl
similarity index 100%
rename from src/main/resources/templates/settings/importResult.ftl
rename to BudgetMasterServer/src/main/resources/templates/settings/importResult.ftl
diff --git a/src/main/resources/templates/settings/importStepOne.ftl b/BudgetMasterServer/src/main/resources/templates/settings/importStepOne.ftl
similarity index 100%
rename from src/main/resources/templates/settings/importStepOne.ftl
rename to BudgetMasterServer/src/main/resources/templates/settings/importStepOne.ftl
diff --git a/src/main/resources/templates/settings/importStepTwo.ftl b/BudgetMasterServer/src/main/resources/templates/settings/importStepTwo.ftl
similarity index 100%
rename from src/main/resources/templates/settings/importStepTwo.ftl
rename to BudgetMasterServer/src/main/resources/templates/settings/importStepTwo.ftl
diff --git a/src/main/resources/templates/settings/settings.ftl b/BudgetMasterServer/src/main/resources/templates/settings/settings.ftl
similarity index 100%
rename from src/main/resources/templates/settings/settings.ftl
rename to BudgetMasterServer/src/main/resources/templates/settings/settings.ftl
diff --git a/src/main/resources/templates/settings/settingsMacros.ftl b/BudgetMasterServer/src/main/resources/templates/settings/settingsMacros.ftl
similarity index 100%
rename from src/main/resources/templates/settings/settingsMacros.ftl
rename to BudgetMasterServer/src/main/resources/templates/settings/settingsMacros.ftl
diff --git a/src/main/resources/templates/statistics.ftl b/BudgetMasterServer/src/main/resources/templates/statistics.ftl
similarity index 100%
rename from src/main/resources/templates/statistics.ftl
rename to BudgetMasterServer/src/main/resources/templates/statistics.ftl
diff --git a/src/main/resources/templates/tags/tags.ftl b/BudgetMasterServer/src/main/resources/templates/tags/tags.ftl
similarity index 100%
rename from src/main/resources/templates/tags/tags.ftl
rename to BudgetMasterServer/src/main/resources/templates/tags/tags.ftl
diff --git a/src/main/resources/templates/templateGroups/deleteTemplateGroupModal.ftl b/BudgetMasterServer/src/main/resources/templates/templateGroups/deleteTemplateGroupModal.ftl
similarity index 100%
rename from src/main/resources/templates/templateGroups/deleteTemplateGroupModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/templateGroups/deleteTemplateGroupModal.ftl
diff --git a/src/main/resources/templates/templateGroups/newTemplateGroup.ftl b/BudgetMasterServer/src/main/resources/templates/templateGroups/newTemplateGroup.ftl
similarity index 100%
rename from src/main/resources/templates/templateGroups/newTemplateGroup.ftl
rename to BudgetMasterServer/src/main/resources/templates/templateGroups/newTemplateGroup.ftl
diff --git a/src/main/resources/templates/templateGroups/templateGroupFunctions.ftl b/BudgetMasterServer/src/main/resources/templates/templateGroups/templateGroupFunctions.ftl
similarity index 100%
rename from src/main/resources/templates/templateGroups/templateGroupFunctions.ftl
rename to BudgetMasterServer/src/main/resources/templates/templateGroups/templateGroupFunctions.ftl
diff --git a/src/main/resources/templates/templateGroups/templateGroups.ftl b/BudgetMasterServer/src/main/resources/templates/templateGroups/templateGroups.ftl
similarity index 100%
rename from src/main/resources/templates/templateGroups/templateGroups.ftl
rename to BudgetMasterServer/src/main/resources/templates/templateGroups/templateGroups.ftl
diff --git a/src/main/resources/templates/templates/createFromTransactionModal.ftl b/BudgetMasterServer/src/main/resources/templates/templates/createFromTransactionModal.ftl
similarity index 100%
rename from src/main/resources/templates/templates/createFromTransactionModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/templates/createFromTransactionModal.ftl
diff --git a/src/main/resources/templates/templates/deleteTemplateModal.ftl b/BudgetMasterServer/src/main/resources/templates/templates/deleteTemplateModal.ftl
similarity index 100%
rename from src/main/resources/templates/templates/deleteTemplateModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/templates/deleteTemplateModal.ftl
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl
similarity index 100%
rename from src/main/resources/templates/templates/newTemplate.ftl
rename to BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl
diff --git a/src/main/resources/templates/templates/templateFunctions.ftl b/BudgetMasterServer/src/main/resources/templates/templates/templateFunctions.ftl
similarity index 100%
rename from src/main/resources/templates/templates/templateFunctions.ftl
rename to BudgetMasterServer/src/main/resources/templates/templates/templateFunctions.ftl
diff --git a/src/main/resources/templates/templates/templates.ftl b/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl
similarity index 100%
rename from src/main/resources/templates/templates/templates.ftl
rename to BudgetMasterServer/src/main/resources/templates/templates/templates.ftl
diff --git a/src/main/resources/templates/transactions/changeTypeModal.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/changeTypeModal.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/changeTypeModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/changeTypeModal.ftl
diff --git a/src/main/resources/templates/transactions/deleteTransactionModal.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/deleteTransactionModal.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/deleteTransactionModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/deleteTransactionModal.ftl
diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/newTransactionMacros.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionNormal.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/newTransactionNormal.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/newTransactionNormal.ftl
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionTransfer.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/newTransactionTransfer.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/newTransactionTransfer.ftl
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/transactions.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl
diff --git a/src/main/resources/templates/transactions/transactionsMacros.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionsMacros.ftl
similarity index 100%
rename from src/main/resources/templates/transactions/transactionsMacros.ftl
rename to BudgetMasterServer/src/main/resources/templates/transactions/transactionsMacros.ftl
diff --git a/src/main/resources/templates/whatsNewModal.ftl b/BudgetMasterServer/src/main/resources/templates/whatsNewModal.ftl
similarity index 100%
rename from src/main/resources/templates/whatsNewModal.ftl
rename to BudgetMasterServer/src/main/resources/templates/whatsNewModal.ftl
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestExecutionListener.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestExecutionListener.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestExecutionListener.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestExecutionListener.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/TransactionTestHelper.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/TransactionTestHelper.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/helpers/TransactionTestHelper.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/TransactionTestHelper.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/AccountTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/AccountTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/AccountTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/AccountTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CategorySelectTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CategorySelectTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CategorySelectTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CategorySelectTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChangeTransactionTypeTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChangeTransactionTypeTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChangeTransactionTypeTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChangeTransactionTypeTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/FirstUseTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/FirstUseTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/FirstUseTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/FirstUseTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/HotkeyTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/LoginControllerTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/MediaTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/MediaTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/MediaTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/MediaTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromExistingOneTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromExistingOneTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromExistingOneTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromExistingOneTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionNormalTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionNormalTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionNormalTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionNormalTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionTransferTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionTransferTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionTransferTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionTransferTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/TagTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/TagTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/TagTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/TagTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/WhatsNewTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/WhatsNewTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/integration/selenium/WhatsNewTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/WhatsNewTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/AccountServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/AccountServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/AccountServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/AccountServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/CategoryServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/CategoryServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/CategoryServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/CategoryServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/IconServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/IconServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/IconServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/IconServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/IconizableTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/IconizableTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/IconizableTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/IconizableTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/ImageServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/ImageServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/ImageServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/ImageServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TemplateGroupServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TemplateGroupServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/TemplateGroupServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TemplateGroupServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TemplateServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TemplateServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/TemplateServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TemplateServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSearchSpecificationsTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSearchSpecificationsTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSearchSpecificationsTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSearchSpecificationsTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSpecificationsTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSpecificationsTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSpecificationsTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionSpecificationsTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/backup/LocalGitBackupTaskTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/backup/LocalGitBackupTaskTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/backup/LocalGitBackupTaskTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/backup/LocalGitBackupTaskTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/backup/RemoteGitBackupTaskTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/backup/RemoteGitBackupTaskTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/backup/RemoteGitBackupTaskTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/backup/RemoteGitBackupTaskTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseExportTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseExportTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseExportTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseExportTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v4Test.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v4Test.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v4Test.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v4Test.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v6Test.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v6Test.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v6Test.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v6Test.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v7Test.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v7Test.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v7Test.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v7Test.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8Test.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8Test.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8Test.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8Test.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8_convertToInternalTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8_convertToInternalTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8_convertToInternalTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v8_convertToInternalTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/Helpers.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/Helpers.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/helpers/Helpers.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/Helpers.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizationHelpers.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizationHelpers.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizationHelpers.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizationHelpers.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizedTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizedTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizedTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LocalizedTest.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LoggerTestUtil.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LoggerTestUtil.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LoggerTestUtil.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/helpers/LoggerTestUtil.java
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/repeating/RepeatingOptionTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/repeating/RepeatingOptionTest.java
similarity index 100%
rename from src/test/java/de/deadlocker8/budgetmaster/unit/repeating/RepeatingOptionTest.java
rename to BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/repeating/RepeatingOptionTest.java
diff --git a/src/test/resources/AccountDatabase.json b/BudgetMasterServer/src/test/resources/AccountDatabase.json
similarity index 100%
rename from src/test/resources/AccountDatabase.json
rename to BudgetMasterServer/src/test/resources/AccountDatabase.json
diff --git a/src/test/resources/DatabaseParser_v3Test.json b/BudgetMasterServer/src/test/resources/DatabaseParser_v3Test.json
similarity index 100%
rename from src/test/resources/DatabaseParser_v3Test.json
rename to BudgetMasterServer/src/test/resources/DatabaseParser_v3Test.json
diff --git a/src/test/resources/DatabaseParser_v4Test.json b/BudgetMasterServer/src/test/resources/DatabaseParser_v4Test.json
similarity index 100%
rename from src/test/resources/DatabaseParser_v4Test.json
rename to BudgetMasterServer/src/test/resources/DatabaseParser_v4Test.json
diff --git a/src/test/resources/DatabaseParser_v5Test.json b/BudgetMasterServer/src/test/resources/DatabaseParser_v5Test.json
similarity index 100%
rename from src/test/resources/DatabaseParser_v5Test.json
rename to BudgetMasterServer/src/test/resources/DatabaseParser_v5Test.json
diff --git a/src/test/resources/DatabaseParser_v6Test.json b/BudgetMasterServer/src/test/resources/DatabaseParser_v6Test.json
similarity index 100%
rename from src/test/resources/DatabaseParser_v6Test.json
rename to BudgetMasterServer/src/test/resources/DatabaseParser_v6Test.json
diff --git a/src/test/resources/DatabaseParser_v7Test.json b/BudgetMasterServer/src/test/resources/DatabaseParser_v7Test.json
similarity index 100%
rename from src/test/resources/DatabaseParser_v7Test.json
rename to BudgetMasterServer/src/test/resources/DatabaseParser_v7Test.json
diff --git a/src/test/resources/DatabaseParser_v8Test.json b/BudgetMasterServer/src/test/resources/DatabaseParser_v8Test.json
similarity index 100%
rename from src/test/resources/DatabaseParser_v8Test.json
rename to BudgetMasterServer/src/test/resources/DatabaseParser_v8Test.json
diff --git a/src/test/resources/ImportServiceTest.json b/BudgetMasterServer/src/test/resources/ImportServiceTest.json
similarity index 100%
rename from src/test/resources/ImportServiceTest.json
rename to BudgetMasterServer/src/test/resources/ImportServiceTest.json
diff --git a/src/test/resources/LegacyParserTest.json b/BudgetMasterServer/src/test/resources/LegacyParserTest.json
similarity index 100%
rename from src/test/resources/LegacyParserTest.json
rename to BudgetMasterServer/src/test/resources/LegacyParserTest.json
diff --git a/src/test/resources/NewTransactionFromExistingOneTest.json b/BudgetMasterServer/src/test/resources/NewTransactionFromExistingOneTest.json
similarity index 100%
rename from src/test/resources/NewTransactionFromExistingOneTest.json
rename to BudgetMasterServer/src/test/resources/NewTransactionFromExistingOneTest.json
diff --git a/src/test/resources/OnlyAccountsWithDifferentImages.json b/BudgetMasterServer/src/test/resources/OnlyAccountsWithDifferentImages.json
similarity index 100%
rename from src/test/resources/OnlyAccountsWithDifferentImages.json
rename to BudgetMasterServer/src/test/resources/OnlyAccountsWithDifferentImages.json
diff --git a/src/test/resources/SearchDatabase.json b/BudgetMasterServer/src/test/resources/SearchDatabase.json
similarity index 100%
rename from src/test/resources/SearchDatabase.json
rename to BudgetMasterServer/src/test/resources/SearchDatabase.json
diff --git a/src/test/resources/TagWithSingleQuoteTest.json b/BudgetMasterServer/src/test/resources/TagWithSingleQuoteTest.json
similarity index 100%
rename from src/test/resources/TagWithSingleQuoteTest.json
rename to BudgetMasterServer/src/test/resources/TagWithSingleQuoteTest.json
diff --git a/src/test/resources/backups/empty/.gitkeep b/BudgetMasterServer/src/test/resources/backups/empty/.gitkeep
similarity index 100%
rename from src/test/resources/backups/empty/.gitkeep
rename to BudgetMasterServer/src/test/resources/backups/empty/.gitkeep
diff --git a/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_07_14_10_50.json b/BudgetMasterServer/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_07_14_10_50.json
similarity index 100%
rename from src/test/resources/backups/three/BudgetMasterDatabase_2020_03_07_14_10_50.json
rename to BudgetMasterServer/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_07_14_10_50.json
diff --git a/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_13_10_50.json b/BudgetMasterServer/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_13_10_50.json
similarity index 100%
rename from src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_13_10_50.json
rename to BudgetMasterServer/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_13_10_50.json
diff --git a/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_14_10_50.json b/BudgetMasterServer/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_14_10_50.json
similarity index 100%
rename from src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_14_10_50.json
rename to BudgetMasterServer/src/test/resources/backups/three/BudgetMasterDatabase_2020_03_08_14_10_50.json
diff --git a/src/test/resources/missing_icon_instances.mv.db b/BudgetMasterServer/src/test/resources/missing_icon_instances.mv.db
similarity index 100%
rename from src/test/resources/missing_icon_instances.mv.db
rename to BudgetMasterServer/src/test/resources/missing_icon_instances.mv.db
diff --git a/src/test/resources/repeating_with_tags.mv.db b/BudgetMasterServer/src/test/resources/repeating_with_tags.mv.db
similarity index 100%
rename from src/test/resources/repeating_with_tags.mv.db
rename to BudgetMasterServer/src/test/resources/repeating_with_tags.mv.db
diff --git a/pom.xml b/pom.xml
index 22df26f5a2ece718bdff3027ef0ae9865625b4e6..3b2e278b378bca6b8f4adf58e73f69c240481a1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,14 @@
<groupId>de.deadlocker8</groupId>
<artifactId>BudgetMaster</artifactId>
+ <packaging>pom</packaging>
<version>2.10.0</version>
<name>BudgetMaster</name>
+ <modules>
+ <module>BudgetMasterServer</module>
+ </modules>
+
<repositories>
<repository>
<id>release</id>
@@ -39,364 +44,17 @@
<relativePath/>
</parent>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>de.thecodelabs</groupId>
- <artifactId>jlibs</artifactId>
- <version>${jlibs.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
- <jlibs.version>3.2.0</jlibs.version>
- <versionizer.version>3.0.1</versionizer.version>
- <webjars-locator.version>0.45</webjars-locator.version>
- <jquery.version>3.6.0</jquery.version>
- <materializecss.version>1.0.0</materializecss.version>
- <fontawesome.version>6.1.0</fontawesome.version>
- <sortablejs.version>1.14.0</sortablejs.version>
- <mousetrap.version>1.6.5</mousetrap.version>
- <codemirror.version>5.62.2</codemirror.version>
- <selenium.version>4.1.3</selenium.version>
- <assertj-core.version>3.22.0</assertj-core.version>
- <jgit.version>6.1.0.202203080745-r</jgit.version>
- <natorder.version>1.1.2</natorder.version>
- <h2database.version>1.4.199</h2database.version>
- <itextpdf.version>5.5.13.3</itextpdf.version>
- <vanilla-picker.version>2.12.1</vanilla-picker.version>
- <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
- <dependency-check-maven.version>6.5.3</dependency-check-maven.version>
- <testcontainer.version>1.16.3</testcontainer.version>
-
<app.versionDate>${maven.build.timestamp}</app.versionDate>
<maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
<app.versionCode>38</app.versionCode>
<app.author>Robert Goldmann</app.author>
-
- <project.outputDirectory>build/${project.version}</project.outputDirectory>
- <project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
- <project.exe>${project.outputDirectory}/${project.artifactName}.exe</project.exe>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-freemarker</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
-
- <dependency>
- <groupId>de.thecodelabs</groupId>
- <artifactId>libUtils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>de.thecodelabs</groupId>
- <artifactId>libStorage</artifactId>
- </dependency>
-
- <dependency>
- <groupId>de.thecodelabs.versionizer</groupId>
- <artifactId>api</artifactId>
- <version>${versionizer.version}</version>
- <exclusions>
- <exclusion>
- <groupId>de.thecodelabs</groupId>
- <artifactId>libLogger-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2database.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.itextpdf</groupId>
- <artifactId>itextpdf</artifactId>
- <version>${itextpdf.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>${jgit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.padler</groupId>
- <artifactId>natorder</artifactId>
- <version>${natorder.version}</version>
- </dependency>
-
- <!--Webjars-->
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>webjars-locator</artifactId>
- <version>${webjars-locator.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- <version>${jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>materializecss</artifactId>
- <version>${materializecss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>font-awesome</artifactId>
- <version>${fontawesome.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>sortablejs</artifactId>
- <version>${sortablejs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>mousetrap</artifactId>
- <version>${mousetrap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>codemirror</artifactId>
- <version>${codemirror.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>vanilla-picker</artifactId>
- <version>${vanilla-picker.version}</version>
- </dependency>
-
-
- <!-- selenium -->
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-firefox-driver</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-support</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj-core.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${testcontainer.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <version>${testcontainer.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.outputDirectory}</outputDirectory>
- <finalName>${project.artifactName}</finalName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
- <configuration>
- <webappDirectory>${basedir}/src/main</webappDirectory>
- <outputDirectory>${project.outputDirectory}</outputDirectory>
- <warName>${project.artifactName}</warName>
- </configuration>
- <executions>
- <execution>
- <id>war-packaging</id>
- <goals>
- <goal>war</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- <configuration>
- <junitArtifactName>junit:junit</junitArtifactName>
- <argLine>${surefireArgLine} -Dfile.encoding=UTF-8</argLine>
-
- <systemPropertyVariables>
- <testProfile>true</testProfile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>aggregate-reports-all</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <title>BudgetMaster Code Coverage</title>
- </configuration>
- </execution>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>surefireArgLine</propertyName>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!--Deploy Plugin-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.3.0</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.exe}</file>
- <type>exe</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>${dependency-check-maven.version}</version>
- <inherited>false</inherited>
- <configuration>
- <skip>false</skip>
- <cveValidForHours>48</cveValidForHours>
- <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
- <failOnError>false</failOnError>
- <formats>
- <format>HTML</format>
- <format>XML</format>
- </formats>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
<distributionManagement>
<repository>
<id>release</id>