diff --git a/.gitignore b/financer-web-client/.gitignore
similarity index 100%
rename from .gitignore
rename to financer-web-client/.gitignore
diff --git a/pom.xml b/financer-web-client/pom.xml
similarity index 100%
rename from pom.xml
rename to financer-web-client/pom.xml
diff --git a/src/main/java/de/financer/FinancerApplication.java b/financer-web-client/src/main/java/de/financer/FinancerApplication.java
similarity index 100%
rename from src/main/java/de/financer/FinancerApplication.java
rename to financer-web-client/src/main/java/de/financer/FinancerApplication.java
diff --git a/src/main/java/de/financer/ResponseReason.java b/financer-web-client/src/main/java/de/financer/ResponseReason.java
similarity index 100%
rename from src/main/java/de/financer/ResponseReason.java
rename to financer-web-client/src/main/java/de/financer/ResponseReason.java
diff --git a/src/main/java/de/financer/config/FinancerConfig.java b/financer-web-client/src/main/java/de/financer/config/FinancerConfig.java
similarity index 100%
rename from src/main/java/de/financer/config/FinancerConfig.java
rename to financer-web-client/src/main/java/de/financer/config/FinancerConfig.java
diff --git a/src/main/java/de/financer/controller/AccountController.java b/financer-web-client/src/main/java/de/financer/controller/AccountController.java
similarity index 100%
rename from src/main/java/de/financer/controller/AccountController.java
rename to financer-web-client/src/main/java/de/financer/controller/AccountController.java
diff --git a/src/main/java/de/financer/controller/AccountGroupController.java b/financer-web-client/src/main/java/de/financer/controller/AccountGroupController.java
similarity index 100%
rename from src/main/java/de/financer/controller/AccountGroupController.java
rename to financer-web-client/src/main/java/de/financer/controller/AccountGroupController.java
diff --git a/src/main/java/de/financer/controller/Function.java b/financer-web-client/src/main/java/de/financer/controller/Function.java
similarity index 100%
rename from src/main/java/de/financer/controller/Function.java
rename to financer-web-client/src/main/java/de/financer/controller/Function.java
diff --git a/src/main/java/de/financer/controller/RecurringTransactionController.java b/financer-web-client/src/main/java/de/financer/controller/RecurringTransactionController.java
similarity index 100%
rename from src/main/java/de/financer/controller/RecurringTransactionController.java
rename to financer-web-client/src/main/java/de/financer/controller/RecurringTransactionController.java
diff --git a/src/main/java/de/financer/controller/TransactionController.java b/financer-web-client/src/main/java/de/financer/controller/TransactionController.java
similarity index 100%
rename from src/main/java/de/financer/controller/TransactionController.java
rename to financer-web-client/src/main/java/de/financer/controller/TransactionController.java
diff --git a/src/main/java/de/financer/controller/handler/NoExceptionResponseErrorHandler.java b/financer-web-client/src/main/java/de/financer/controller/handler/NoExceptionResponseErrorHandler.java
similarity index 100%
rename from src/main/java/de/financer/controller/handler/NoExceptionResponseErrorHandler.java
rename to financer-web-client/src/main/java/de/financer/controller/handler/NoExceptionResponseErrorHandler.java
diff --git a/src/main/java/de/financer/controller/template/FinancerRestTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/FinancerRestTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/FinancerRestTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/FinancerRestTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAccountByKeyTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAccountByKeyTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAccountByKeyTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAccountByKeyTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAllAccountGroupsTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAllAccountGroupsTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAllAccountGroupsTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAllAccountGroupsTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAllAccountsTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAllAccountsTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAllAccountsTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAllAccountsTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAllActiveRecurringTransactionsTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAllActiveRecurringTransactionsTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAllActiveRecurringTransactionsTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAllActiveRecurringTransactionsTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAllRecurringTransactionsDueTodayTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAllRecurringTransactionsDueTodayTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAllRecurringTransactionsDueTodayTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAllRecurringTransactionsDueTodayTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAllRecurringTransactionsTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAllRecurringTransactionsTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAllRecurringTransactionsTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAllRecurringTransactionsTemplate.java
diff --git a/src/main/java/de/financer/controller/template/GetAllTransactionsForAccountTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/GetAllTransactionsForAccountTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/GetAllTransactionsForAccountTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/GetAllTransactionsForAccountTemplate.java
diff --git a/src/main/java/de/financer/controller/template/StringTemplate.java b/financer-web-client/src/main/java/de/financer/controller/template/StringTemplate.java
similarity index 100%
rename from src/main/java/de/financer/controller/template/StringTemplate.java
rename to financer-web-client/src/main/java/de/financer/controller/template/StringTemplate.java
diff --git a/src/main/java/de/financer/form/NewAccountForm.java b/financer-web-client/src/main/java/de/financer/form/NewAccountForm.java
similarity index 100%
rename from src/main/java/de/financer/form/NewAccountForm.java
rename to financer-web-client/src/main/java/de/financer/form/NewAccountForm.java
diff --git a/src/main/java/de/financer/form/NewAccountGroupForm.java b/financer-web-client/src/main/java/de/financer/form/NewAccountGroupForm.java
similarity index 100%
rename from src/main/java/de/financer/form/NewAccountGroupForm.java
rename to financer-web-client/src/main/java/de/financer/form/NewAccountGroupForm.java
diff --git a/src/main/java/de/financer/form/NewRecurringTransactionForm.java b/financer-web-client/src/main/java/de/financer/form/NewRecurringTransactionForm.java
similarity index 100%
rename from src/main/java/de/financer/form/NewRecurringTransactionForm.java
rename to financer-web-client/src/main/java/de/financer/form/NewRecurringTransactionForm.java
diff --git a/src/main/java/de/financer/form/NewTransactionForm.java b/financer-web-client/src/main/java/de/financer/form/NewTransactionForm.java
similarity index 100%
rename from src/main/java/de/financer/form/NewTransactionForm.java
rename to financer-web-client/src/main/java/de/financer/form/NewTransactionForm.java
diff --git a/src/main/java/de/financer/form/RecurringToTransactionWithAmountForm.java b/financer-web-client/src/main/java/de/financer/form/RecurringToTransactionWithAmountForm.java
similarity index 100%
rename from src/main/java/de/financer/form/RecurringToTransactionWithAmountForm.java
rename to financer-web-client/src/main/java/de/financer/form/RecurringToTransactionWithAmountForm.java
diff --git a/src/main/java/de/financer/model/Account.java b/financer-web-client/src/main/java/de/financer/model/Account.java
similarity index 100%
rename from src/main/java/de/financer/model/Account.java
rename to financer-web-client/src/main/java/de/financer/model/Account.java
diff --git a/src/main/java/de/financer/model/AccountGroup.java b/financer-web-client/src/main/java/de/financer/model/AccountGroup.java
similarity index 100%
rename from src/main/java/de/financer/model/AccountGroup.java
rename to financer-web-client/src/main/java/de/financer/model/AccountGroup.java
diff --git a/src/main/java/de/financer/model/AccountStatus.java b/financer-web-client/src/main/java/de/financer/model/AccountStatus.java
similarity index 100%
rename from src/main/java/de/financer/model/AccountStatus.java
rename to financer-web-client/src/main/java/de/financer/model/AccountStatus.java
diff --git a/src/main/java/de/financer/model/AccountType.java b/financer-web-client/src/main/java/de/financer/model/AccountType.java
similarity index 100%
rename from src/main/java/de/financer/model/AccountType.java
rename to financer-web-client/src/main/java/de/financer/model/AccountType.java
diff --git a/src/main/java/de/financer/model/HolidayWeekendType.java b/financer-web-client/src/main/java/de/financer/model/HolidayWeekendType.java
similarity index 100%
rename from src/main/java/de/financer/model/HolidayWeekendType.java
rename to financer-web-client/src/main/java/de/financer/model/HolidayWeekendType.java
diff --git a/src/main/java/de/financer/model/IntervalType.java b/financer-web-client/src/main/java/de/financer/model/IntervalType.java
similarity index 100%
rename from src/main/java/de/financer/model/IntervalType.java
rename to financer-web-client/src/main/java/de/financer/model/IntervalType.java
diff --git a/src/main/java/de/financer/model/RecurringTransaction.java b/financer-web-client/src/main/java/de/financer/model/RecurringTransaction.java
similarity index 100%
rename from src/main/java/de/financer/model/RecurringTransaction.java
rename to financer-web-client/src/main/java/de/financer/model/RecurringTransaction.java
diff --git a/src/main/java/de/financer/model/Transaction.java b/financer-web-client/src/main/java/de/financer/model/Transaction.java
similarity index 100%
rename from src/main/java/de/financer/model/Transaction.java
rename to financer-web-client/src/main/java/de/financer/model/Transaction.java
diff --git a/src/main/java/de/financer/util/ControllerUtils.java b/financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
similarity index 100%
rename from src/main/java/de/financer/util/ControllerUtils.java
rename to financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
diff --git a/src/main/java/de/financer/util/TransactionUtils.java b/financer-web-client/src/main/java/de/financer/util/TransactionUtils.java
similarity index 100%
rename from src/main/java/de/financer/util/TransactionUtils.java
rename to financer-web-client/src/main/java/de/financer/util/TransactionUtils.java
diff --git a/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java b/financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java
similarity index 100%
rename from src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java
rename to financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java
diff --git a/src/main/java/de/financer/util/comparator/TransactionByDateByIdDescComparator.java b/financer-web-client/src/main/java/de/financer/util/comparator/TransactionByDateByIdDescComparator.java
similarity index 100%
rename from src/main/java/de/financer/util/comparator/TransactionByDateByIdDescComparator.java
rename to financer-web-client/src/main/java/de/financer/util/comparator/TransactionByDateByIdDescComparator.java
diff --git a/src/main/resources/config/application-dev.properties b/financer-web-client/src/main/resources/config/application-dev.properties
similarity index 100%
rename from src/main/resources/config/application-dev.properties
rename to financer-web-client/src/main/resources/config/application-dev.properties
diff --git a/src/main/resources/config/application.properties b/financer-web-client/src/main/resources/config/application.properties
similarity index 100%
rename from src/main/resources/config/application.properties
rename to financer-web-client/src/main/resources/config/application.properties
diff --git a/src/main/resources/i18n/message.properties b/financer-web-client/src/main/resources/i18n/message.properties
similarity index 100%
rename from src/main/resources/i18n/message.properties
rename to financer-web-client/src/main/resources/i18n/message.properties
diff --git a/src/main/resources/i18n/message_de_DE.properties b/financer-web-client/src/main/resources/i18n/message_de_DE.properties
similarity index 100%
rename from src/main/resources/i18n/message_de_DE.properties
rename to financer-web-client/src/main/resources/i18n/message_de_DE.properties
diff --git a/src/main/resources/static/css/main.css b/financer-web-client/src/main/resources/static/css/main.css
similarity index 100%
rename from src/main/resources/static/css/main.css
rename to financer-web-client/src/main/resources/static/css/main.css
diff --git a/src/main/resources/templates/account/accountDetails.html b/financer-web-client/src/main/resources/templates/account/accountDetails.html
similarity index 100%
rename from src/main/resources/templates/account/accountDetails.html
rename to financer-web-client/src/main/resources/templates/account/accountDetails.html
diff --git a/src/main/resources/templates/account/accountOverview.html b/financer-web-client/src/main/resources/templates/account/accountOverview.html
similarity index 100%
rename from src/main/resources/templates/account/accountOverview.html
rename to financer-web-client/src/main/resources/templates/account/accountOverview.html
diff --git a/src/main/resources/templates/account/newAccount.html b/financer-web-client/src/main/resources/templates/account/newAccount.html
similarity index 100%
rename from src/main/resources/templates/account/newAccount.html
rename to financer-web-client/src/main/resources/templates/account/newAccount.html
diff --git a/src/main/resources/templates/accountGroup/newAccountGroup.html b/financer-web-client/src/main/resources/templates/accountGroup/newAccountGroup.html
similarity index 100%
rename from src/main/resources/templates/accountGroup/newAccountGroup.html
rename to financer-web-client/src/main/resources/templates/accountGroup/newAccountGroup.html
diff --git a/src/main/resources/templates/includes/footer.html b/financer-web-client/src/main/resources/templates/includes/footer.html
similarity index 100%
rename from src/main/resources/templates/includes/footer.html
rename to financer-web-client/src/main/resources/templates/includes/footer.html
diff --git a/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html b/financer-web-client/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html
similarity index 100%
rename from src/main/resources/templates/recurringTransaction/newRecurringTransaction.html
rename to financer-web-client/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html
diff --git a/src/main/resources/templates/recurringTransaction/recurringToTransactionWithAmount.html b/financer-web-client/src/main/resources/templates/recurringTransaction/recurringToTransactionWithAmount.html
similarity index 100%
rename from src/main/resources/templates/recurringTransaction/recurringToTransactionWithAmount.html
rename to financer-web-client/src/main/resources/templates/recurringTransaction/recurringToTransactionWithAmount.html
diff --git a/src/main/resources/templates/recurringTransaction/recurringTransactionList.html b/financer-web-client/src/main/resources/templates/recurringTransaction/recurringTransactionList.html
similarity index 100%
rename from src/main/resources/templates/recurringTransaction/recurringTransactionList.html
rename to financer-web-client/src/main/resources/templates/recurringTransaction/recurringTransactionList.html
diff --git a/src/main/resources/templates/transaction/newTransaction.html b/financer-web-client/src/main/resources/templates/transaction/newTransaction.html
similarity index 100%
rename from src/main/resources/templates/transaction/newTransaction.html
rename to financer-web-client/src/main/resources/templates/transaction/newTransaction.html
diff --git a/src/test/java/de/financer/FinancerApplicationBootTest.java b/financer-web-client/src/test/java/de/financer/FinancerApplicationBootTest.java
similarity index 100%
rename from src/test/java/de/financer/FinancerApplicationBootTest.java
rename to financer-web-client/src/test/java/de/financer/FinancerApplicationBootTest.java
diff --git a/src/test/resources/application-integrationtest.properties b/financer-web-client/src/test/resources/application-integrationtest.properties
similarity index 100%
rename from src/test/resources/application-integrationtest.properties
rename to financer-web-client/src/test/resources/application-integrationtest.properties