diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..594f134
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+pefi
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b657c43..1ef4b43 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,13 +5,15 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/share/java/gradle" />
         <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/APIGateway" />
-            <option value="$PROJECT_DIR$/Common" />
-            <option value="$PROJECT_DIR$/PersonalFinancesService" />
+            <option value="$PROJECT_DIR$/pefi-api-gateway" />
+            <option value="$PROJECT_DIR$/pefi-common" />
+            <option value="$PROJECT_DIR$/pefi-frontend" />
+            <option value="$PROJECT_DIR$/pefi-monolith" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index e4024dd..eef8c4b 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueGroupRepository.java" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueGroupRepository.java" dialect="GenericSQL" />
     <file url="PROJECT" dialect="PostgreSQL" />
   </component>
 </project>
\ No newline at end of file
diff --git a/APIGateway/settings.gradle b/APIGateway/settings.gradle
deleted file mode 100644
index 4907e98..0000000
--- a/APIGateway/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'api-gateway'
diff --git a/APIGateway/src/test/java/dev/mvvasilev/gateway/ApiGatewayApplicationTests.java b/APIGateway/src/test/java/dev/mvvasilev/gateway/ApiGatewayApplicationTests.java
deleted file mode 100644
index f44cf99..0000000
--- a/APIGateway/src/test/java/dev/mvvasilev/gateway/ApiGatewayApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.mvvasilev.gateway;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ApiGatewayApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}
diff --git a/PersonalFinancesService/settings.gradle b/PersonalFinancesService/settings.gradle
deleted file mode 100644
index 9cfcf03..0000000
--- a/PersonalFinancesService/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'personal-finances-service'
diff --git a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/PersonalFinancesServiceApplicationTests.java b/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/PersonalFinancesServiceApplicationTests.java
deleted file mode 100644
index 2568bd8..0000000
--- a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/PersonalFinancesServiceApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.mvvasilev.finances;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class PersonalFinancesServiceApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}
diff --git a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/services/CategoryServiceTest.java b/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/services/CategoryServiceTest.java
deleted file mode 100644
index b58c1dd..0000000
--- a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/services/CategoryServiceTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package dev.mvvasilev.finances.services;
-
-import dev.mvvasilev.finances.CategorizationBuilder;
-import dev.mvvasilev.finances.persistence.CategorizationRepository;
-import dev.mvvasilev.finances.persistence.ProcessedTransactionCategoryRepository;
-import dev.mvvasilev.finances.persistence.ProcessedTransactionRepository;
-import dev.mvvasilev.finances.persistence.TransactionCategoryRepository;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import static org.junit.jupiter.api.Assertions.*;
-@SpringBootTest
-class CategoryServiceTest {
-
-    @MockBean
-    private TransactionCategoryRepository transactionCategoryRepository;
-
-    @MockBean
-    private CategorizationRepository categorizationRepository;
-
-    @MockBean
-    private ProcessedTransactionRepository processedTransactionRepository;
-
-    @MockBean
-    private ProcessedTransactionCategoryRepository processedTransactionCategoryRepository;
-
-    @Autowired
-    private CategoryService service;
-
-    @Test
-    void matchesRule() {
-
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8cbf986..e69de29 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +0,0 @@
-plugins {
-    id 'java'
-}
-
-group = 'dev.mvvasilev'
-version = '1.0-SNAPSHOT'
-
-repositories {
-    mavenCentral()
-}
\ No newline at end of file
diff --git a/APIGateway/.env.example b/pefi-api-gateway/.env.example
similarity index 100%
rename from APIGateway/.env.example
rename to pefi-api-gateway/.env.example
diff --git a/APIGateway/.gitignore b/pefi-api-gateway/.gitignore
similarity index 100%
rename from APIGateway/.gitignore
rename to pefi-api-gateway/.gitignore
diff --git a/APIGateway/Dockerfile b/pefi-api-gateway/Dockerfile
similarity index 100%
rename from APIGateway/Dockerfile
rename to pefi-api-gateway/Dockerfile
diff --git a/APIGateway/build.gradle b/pefi-api-gateway/build.gradle
similarity index 71%
rename from APIGateway/build.gradle
rename to pefi-api-gateway/build.gradle
index be3f5bf..ea6ea5e 100644
--- a/APIGateway/build.gradle
+++ b/pefi-api-gateway/build.gradle
@@ -21,17 +21,16 @@ ext {
 }
 
 dependencies {
-//	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-//	implementation 'org.springframework.boot:spring-boot-starter-security'
-//	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
 	implementation 'org.springframework.session:spring-session-core'
 	implementation 'org.springframework.session:spring-session-data-redis'
+
 	implementation 'io.lettuce:lettuce-core'
-//	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-//	testImplementation 'org.springframework.security:spring-security-test'
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework.security:spring-security-test'
 }
 
 dependencyManagement {
diff --git a/pefi-api-gateway/settings.gradle b/pefi-api-gateway/settings.gradle
new file mode 100644
index 0000000..e0a7a2d
--- /dev/null
+++ b/pefi-api-gateway/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'pefi-api-gateway'
diff --git a/APIGateway/src/main/java/dev/mvvasilev/gateway/ApiGatewayApplication.java b/pefi-api-gateway/src/main/java/dev/mvvasilev/gateway/ApiGatewayApplication.java
similarity index 100%
rename from APIGateway/src/main/java/dev/mvvasilev/gateway/ApiGatewayApplication.java
rename to pefi-api-gateway/src/main/java/dev/mvvasilev/gateway/ApiGatewayApplication.java
diff --git a/APIGateway/src/main/java/dev/mvvasilev/gateway/SecurityConfiguration.java b/pefi-api-gateway/src/main/java/dev/mvvasilev/gateway/SecurityConfiguration.java
similarity index 100%
rename from APIGateway/src/main/java/dev/mvvasilev/gateway/SecurityConfiguration.java
rename to pefi-api-gateway/src/main/java/dev/mvvasilev/gateway/SecurityConfiguration.java
diff --git a/APIGateway/src/main/resources/application.yml b/pefi-api-gateway/src/main/resources/application.yml
similarity index 100%
rename from APIGateway/src/main/resources/application.yml
rename to pefi-api-gateway/src/main/resources/application.yml
diff --git a/Common/build.gradle b/pefi-common/build.gradle
similarity index 100%
rename from Common/build.gradle
rename to pefi-common/build.gradle
diff --git a/pefi-common/settings.gradle b/pefi-common/settings.gradle
new file mode 100644
index 0000000..cafe34e
--- /dev/null
+++ b/pefi-common/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'pefi-common'
\ No newline at end of file
diff --git a/Common/src/main/java/dev/mvvasilev/common/controller/AbstractRestController.java b/pefi-common/src/main/java/dev/mvvasilev/common/controller/AbstractRestController.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/controller/AbstractRestController.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/controller/AbstractRestController.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/data/AbstractEntity.java b/pefi-common/src/main/java/dev/mvvasilev/common/data/AbstractEntity.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/data/AbstractEntity.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/data/AbstractEntity.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/data/AbstractEnumConverter.java b/pefi-common/src/main/java/dev/mvvasilev/common/data/AbstractEnumConverter.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/data/AbstractEnumConverter.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/data/AbstractEnumConverter.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/data/DatabaseStorable.java b/pefi-common/src/main/java/dev/mvvasilev/common/data/DatabaseStorable.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/data/DatabaseStorable.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/data/DatabaseStorable.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/data/PersistableEnum.java b/pefi-common/src/main/java/dev/mvvasilev/common/data/PersistableEnum.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/data/PersistableEnum.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/data/PersistableEnum.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/data/UserOwned.java b/pefi-common/src/main/java/dev/mvvasilev/common/data/UserOwned.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/data/UserOwned.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/data/UserOwned.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/data/UserOwnedEntityRepository.java b/pefi-common/src/main/java/dev/mvvasilev/common/data/UserOwnedEntityRepository.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/data/UserOwnedEntityRepository.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/data/UserOwnedEntityRepository.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/exceptions/CommonFinancesException.java b/pefi-common/src/main/java/dev/mvvasilev/common/exceptions/CommonFinancesException.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/exceptions/CommonFinancesException.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/exceptions/CommonFinancesException.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/exceptions/InvalidUserIdException.java b/pefi-common/src/main/java/dev/mvvasilev/common/exceptions/InvalidUserIdException.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/exceptions/InvalidUserIdException.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/exceptions/InvalidUserIdException.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/web/APIErrorDTO.java b/pefi-common/src/main/java/dev/mvvasilev/common/web/APIErrorDTO.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/web/APIErrorDTO.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/web/APIErrorDTO.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/web/APIResponseDTO.java b/pefi-common/src/main/java/dev/mvvasilev/common/web/APIResponseDTO.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/web/APIResponseDTO.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/web/APIResponseDTO.java
diff --git a/Common/src/main/java/dev/mvvasilev/common/web/CrudResponseDTO.java b/pefi-common/src/main/java/dev/mvvasilev/common/web/CrudResponseDTO.java
similarity index 100%
rename from Common/src/main/java/dev/mvvasilev/common/web/CrudResponseDTO.java
rename to pefi-common/src/main/java/dev/mvvasilev/common/web/CrudResponseDTO.java
diff --git a/frontend/.eslintrc.cjs b/pefi-frontend/.eslintrc.cjs
similarity index 100%
rename from frontend/.eslintrc.cjs
rename to pefi-frontend/.eslintrc.cjs
diff --git a/frontend/.gitignore b/pefi-frontend/.gitignore
similarity index 100%
rename from frontend/.gitignore
rename to pefi-frontend/.gitignore
diff --git a/frontend/README.md b/pefi-frontend/README.md
similarity index 100%
rename from frontend/README.md
rename to pefi-frontend/README.md
diff --git a/pefi-frontend/build.gradle b/pefi-frontend/build.gradle
new file mode 100644
index 0000000..23fb1d0
--- /dev/null
+++ b/pefi-frontend/build.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id 'com.github.node-gradle.node' version '7.0.1'
+}
+
+tasks.register('build', NpmTask) {
+    args = ['run', 'build']
+}
\ No newline at end of file
diff --git a/frontend/index.html b/pefi-frontend/index.html
similarity index 100%
rename from frontend/index.html
rename to pefi-frontend/index.html
diff --git a/frontend/package-lock.json b/pefi-frontend/package-lock.json
similarity index 100%
rename from frontend/package-lock.json
rename to pefi-frontend/package-lock.json
diff --git a/frontend/package.json b/pefi-frontend/package.json
similarity index 100%
rename from frontend/package.json
rename to pefi-frontend/package.json
diff --git a/frontend/public/vite.svg b/pefi-frontend/public/vite.svg
similarity index 100%
rename from frontend/public/vite.svg
rename to pefi-frontend/public/vite.svg
diff --git a/pefi-frontend/settings.gradle b/pefi-frontend/settings.gradle
new file mode 100644
index 0000000..383dd8c
--- /dev/null
+++ b/pefi-frontend/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'pefi-frontend'
\ No newline at end of file
diff --git a/frontend/src/App.css b/pefi-frontend/src/App.css
similarity index 100%
rename from frontend/src/App.css
rename to pefi-frontend/src/App.css
diff --git a/frontend/src/App.jsx b/pefi-frontend/src/App.jsx
similarity index 100%
rename from frontend/src/App.jsx
rename to pefi-frontend/src/App.jsx
diff --git a/frontend/src/app/Layout.jsx b/pefi-frontend/src/app/Layout.jsx
similarity index 100%
rename from frontend/src/app/Layout.jsx
rename to pefi-frontend/src/app/Layout.jsx
diff --git a/frontend/src/app/pages/CategoriesPage.jsx b/pefi-frontend/src/app/pages/CategoriesPage.jsx
similarity index 100%
rename from frontend/src/app/pages/CategoriesPage.jsx
rename to pefi-frontend/src/app/pages/CategoriesPage.jsx
diff --git a/frontend/src/app/pages/StatementsPage.jsx b/pefi-frontend/src/app/pages/StatementsPage.jsx
similarity index 100%
rename from frontend/src/app/pages/StatementsPage.jsx
rename to pefi-frontend/src/app/pages/StatementsPage.jsx
diff --git a/frontend/src/app/pages/StatisticsPage.jsx b/pefi-frontend/src/app/pages/StatisticsPage.jsx
similarity index 100%
rename from frontend/src/app/pages/StatisticsPage.jsx
rename to pefi-frontend/src/app/pages/StatisticsPage.jsx
diff --git a/frontend/src/app/pages/TransactionsPage.jsx b/pefi-frontend/src/app/pages/TransactionsPage.jsx
similarity index 100%
rename from frontend/src/app/pages/TransactionsPage.jsx
rename to pefi-frontend/src/app/pages/TransactionsPage.jsx
diff --git a/frontend/src/assets/favicon.ico b/pefi-frontend/src/assets/favicon.ico
similarity index 100%
rename from frontend/src/assets/favicon.ico
rename to pefi-frontend/src/assets/favicon.ico
diff --git a/frontend/src/assets/react.svg b/pefi-frontend/src/assets/react.svg
similarity index 100%
rename from frontend/src/assets/react.svg
rename to pefi-frontend/src/assets/react.svg
diff --git a/frontend/src/components/MediaCard.jsx b/pefi-frontend/src/components/MediaCard.jsx
similarity index 100%
rename from frontend/src/components/MediaCard.jsx
rename to pefi-frontend/src/components/MediaCard.jsx
diff --git a/frontend/src/components/ThemeRegistry/theme.js b/pefi-frontend/src/components/ThemeRegistry/theme.js
similarity index 100%
rename from frontend/src/components/ThemeRegistry/theme.js
rename to pefi-frontend/src/components/ThemeRegistry/theme.js
diff --git a/frontend/src/components/VisuallyHiddenInput.jsx b/pefi-frontend/src/components/VisuallyHiddenInput.jsx
similarity index 100%
rename from frontend/src/components/VisuallyHiddenInput.jsx
rename to pefi-frontend/src/components/VisuallyHiddenInput.jsx
diff --git a/frontend/src/components/categories/CategoriesBox.jsx b/pefi-frontend/src/components/categories/CategoriesBox.jsx
similarity index 100%
rename from frontend/src/components/categories/CategoriesBox.jsx
rename to pefi-frontend/src/components/categories/CategoriesBox.jsx
diff --git a/frontend/src/components/categories/CategorizationRule.jsx b/pefi-frontend/src/components/categories/CategorizationRule.jsx
similarity index 100%
rename from frontend/src/components/categories/CategorizationRule.jsx
rename to pefi-frontend/src/components/categories/CategorizationRule.jsx
diff --git a/frontend/src/components/categories/CategorizationRulesEditor.jsx b/pefi-frontend/src/components/categories/CategorizationRulesEditor.jsx
similarity index 100%
rename from frontend/src/components/categories/CategorizationRulesEditor.jsx
rename to pefi-frontend/src/components/categories/CategorizationRulesEditor.jsx
diff --git a/frontend/src/components/statements/NodeModal.jsx b/pefi-frontend/src/components/statements/NodeModal.jsx
similarity index 100%
rename from frontend/src/components/statements/NodeModal.jsx
rename to pefi-frontend/src/components/statements/NodeModal.jsx
diff --git a/frontend/src/components/statements/StatementCard.jsx b/pefi-frontend/src/components/statements/StatementCard.jsx
similarity index 100%
rename from frontend/src/components/statements/StatementCard.jsx
rename to pefi-frontend/src/components/statements/StatementCard.jsx
diff --git a/frontend/src/components/statements/StatementMappingEditor.jsx b/pefi-frontend/src/components/statements/StatementMappingEditor.jsx
similarity index 100%
rename from frontend/src/components/statements/StatementMappingEditor.jsx
rename to pefi-frontend/src/components/statements/StatementMappingEditor.jsx
diff --git a/frontend/src/components/widgets/WidgetContainer.jsx b/pefi-frontend/src/components/widgets/WidgetContainer.jsx
similarity index 100%
rename from frontend/src/components/widgets/WidgetContainer.jsx
rename to pefi-frontend/src/components/widgets/WidgetContainer.jsx
diff --git a/frontend/src/components/widgets/WidgetEditModal.jsx b/pefi-frontend/src/components/widgets/WidgetEditModal.jsx
similarity index 100%
rename from frontend/src/components/widgets/WidgetEditModal.jsx
rename to pefi-frontend/src/components/widgets/WidgetEditModal.jsx
diff --git a/frontend/src/components/widgets/WidgetParameters.js b/pefi-frontend/src/components/widgets/WidgetParameters.js
similarity index 100%
rename from frontend/src/components/widgets/WidgetParameters.js
rename to pefi-frontend/src/components/widgets/WidgetParameters.js
diff --git a/frontend/src/index.css b/pefi-frontend/src/index.css
similarity index 100%
rename from frontend/src/index.css
rename to pefi-frontend/src/index.css
diff --git a/frontend/src/main.jsx b/pefi-frontend/src/main.jsx
similarity index 100%
rename from frontend/src/main.jsx
rename to pefi-frontend/src/main.jsx
diff --git a/frontend/src/utils.js b/pefi-frontend/src/utils.js
similarity index 100%
rename from frontend/src/utils.js
rename to pefi-frontend/src/utils.js
diff --git a/frontend/vite.config.js b/pefi-frontend/vite.config.js
similarity index 100%
rename from frontend/vite.config.js
rename to pefi-frontend/vite.config.js
diff --git a/PersonalFinancesService/.env.example b/pefi-monolith/.env.example
similarity index 100%
rename from PersonalFinancesService/.env.example
rename to pefi-monolith/.env.example
diff --git a/PersonalFinancesService/.gitignore b/pefi-monolith/.gitignore
similarity index 100%
rename from PersonalFinancesService/.gitignore
rename to pefi-monolith/.gitignore
diff --git a/PersonalFinancesService/Dockerfile b/pefi-monolith/Dockerfile
similarity index 100%
rename from PersonalFinancesService/Dockerfile
rename to pefi-monolith/Dockerfile
diff --git a/PersonalFinancesService/build.gradle b/pefi-monolith/build.gradle
similarity index 97%
rename from PersonalFinancesService/build.gradle
rename to pefi-monolith/build.gradle
index 6440a5e..bb25f91 100644
--- a/PersonalFinancesService/build.gradle
+++ b/pefi-monolith/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 	implementation 'org.apache.poi:poi:5.2.5'
 	implementation 'org.apache.poi:poi-ooxml:5.2.5'
 
-	implementation project(":Common")
+	implementation project(":pefi-common")
 
 	runtimeOnly 'com.h2database:h2'
 	runtimeOnly 'org.postgresql:postgresql'
diff --git a/pefi-monolith/settings.gradle b/pefi-monolith/settings.gradle
new file mode 100644
index 0000000..972c762
--- /dev/null
+++ b/pefi-monolith/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'pefi-monolith'
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/PersonalFinancesServiceApplication.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/PersonalFinancesServiceApplication.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/PersonalFinancesServiceApplication.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/PersonalFinancesServiceApplication.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/advice/APIResponseAdvice.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/advice/APIResponseAdvice.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/advice/APIResponseAdvice.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/advice/APIResponseAdvice.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/configuration/SecurityConfiguration.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/configuration/SecurityConfiguration.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/configuration/SecurityConfiguration.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/configuration/SecurityConfiguration.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/configuration/SwaggerConfiguration.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/configuration/SwaggerConfiguration.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/configuration/SwaggerConfiguration.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/configuration/SwaggerConfiguration.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/CategoriesController.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/CategoriesController.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/CategoriesController.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/CategoriesController.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/DebugController.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/DebugController.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/DebugController.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/DebugController.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/ProcessedTransactionsController.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/ProcessedTransactionsController.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/ProcessedTransactionsController.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/ProcessedTransactionsController.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/StatementsController.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/StatementsController.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/StatementsController.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/StatementsController.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/StatisticsController.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/StatisticsController.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/StatisticsController.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/StatisticsController.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/WidgetsController.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/WidgetsController.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/controllers/WidgetsController.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/controllers/WidgetsController.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CategorizationDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CategorizationDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CategorizationDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CategorizationDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CategorizationRuleDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CategorizationRuleDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CategorizationRuleDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CategorizationRuleDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CategoryDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CategoryDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CategoryDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CategoryDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateCategorizationDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateCategorizationDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateCategorizationDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateCategorizationDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateCategoryDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateCategoryDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateCategoryDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateCategoryDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateTransactionMappingDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateTransactionMappingDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateTransactionMappingDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateTransactionMappingDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateUpdateWidgetDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateUpdateWidgetDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateUpdateWidgetDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateUpdateWidgetDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateWidgetParameterDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateWidgetParameterDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/CreateWidgetParameterDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/CreateWidgetParameterDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/ImportExportCategoriesDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/ImportExportCategoriesDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/ImportExportCategoriesDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/ImportExportCategoriesDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionFieldDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionFieldDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionFieldDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/ProcessedTransactionFieldDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoriesDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoriesDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoriesDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoriesDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoryDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoryDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoryDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SpendingByCategoryDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SpendingOverTimeByCategoryDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SpendingOverTimeByCategoryDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SpendingOverTimeByCategoryDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SpendingOverTimeByCategoryDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SupportedMappingConversionDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SupportedMappingConversionDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/SupportedMappingConversionDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/SupportedMappingConversionDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/TransactionCategoryDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/TransactionCategoryDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/TransactionCategoryDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/TransactionCategoryDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/TransactionMappingDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/TransactionMappingDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/TransactionMappingDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/TransactionMappingDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/TransactionValueGroupDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/TransactionValueGroupDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/TransactionValueGroupDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/TransactionValueGroupDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/UpdateCategoryDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/UpdateCategoryDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/UpdateCategoryDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/UpdateCategoryDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/UploadedStatementDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/UploadedStatementDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/UploadedStatementDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/UploadedStatementDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/WidgetDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/WidgetDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/WidgetDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/WidgetDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/WidgetParameterDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/WidgetParameterDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/dtos/WidgetParameterDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/dtos/WidgetParameterDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/Categorization.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/Categorization.java
similarity index 99%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/Categorization.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/Categorization.java
index 8d501d3..e1bcbbf 100644
--- a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/Categorization.java
+++ b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/Categorization.java
@@ -49,7 +49,7 @@ public class Categorization extends AbstractEntity implements UserOwned {
 
     @Override
     public Integer getUserId() {
-        return null;
+        return userId;
     }
 
     public void setUserId(Integer userId) {
@@ -159,4 +159,6 @@ public class Categorization extends AbstractEntity implements UserOwned {
     public void setRoot(boolean root) {
         isRoot = root;
     }
+
+
 }
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransaction.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransaction.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransaction.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransaction.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransactionCategory.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransactionCategory.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransactionCategory.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/ProcessedTransactionCategory.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/RawStatement.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/RawStatement.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/RawStatement.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/RawStatement.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValue.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValue.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValue.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValue.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValueGroup.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValueGroup.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValueGroup.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/RawTransactionValueGroup.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/TransactionCategory.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/TransactionCategory.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/TransactionCategory.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/TransactionCategory.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/TransactionMapping.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/TransactionMapping.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/TransactionMapping.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/TransactionMapping.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/Widget.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/Widget.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/Widget.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/Widget.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/WidgetParameter.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/WidgetParameter.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/entity/WidgetParameter.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/entity/WidgetParameter.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/CategorizationRule.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/CategorizationRule.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/CategorizationRule.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/CategorizationRule.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/CategorizationRuleBehavior.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/CategorizationRuleBehavior.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/CategorizationRuleBehavior.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/CategorizationRuleBehavior.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/MappingConversionType.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/MappingConversionType.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/MappingConversionType.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/MappingConversionType.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/ProcessedTransactionField.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/ProcessedTransactionField.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/ProcessedTransactionField.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/ProcessedTransactionField.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/RawTransactionValueType.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/RawTransactionValueType.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/RawTransactionValueType.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/RawTransactionValueType.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/TimePeriod.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/TimePeriod.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/TimePeriod.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/TimePeriod.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/WidgetType.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/WidgetType.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/enums/WidgetType.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/enums/WidgetType.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/CategorizationRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/CategorizationRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/CategorizationRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/CategorizationRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionCategoryRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionCategoryRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionCategoryRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionCategoryRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/ProcessedTransactionRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawStatementRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawStatementRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawStatementRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawStatementRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueGroupRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueGroupRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueGroupRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueGroupRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/RawTransactionValueRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/StatisticsRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/StatisticsRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/StatisticsRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/StatisticsRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/TransactionCategoryRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/TransactionCategoryRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/TransactionCategoryRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/TransactionCategoryRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/TransactionMappingRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/TransactionMappingRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/TransactionMappingRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/TransactionMappingRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/WidgetParameterRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/WidgetParameterRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/WidgetParameterRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/WidgetParameterRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/WidgetRepository.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/WidgetRepository.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/WidgetRepository.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/WidgetRepository.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawStatementDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawStatementDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawStatementDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawStatementDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionValueGroupDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionValueGroupDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionValueGroupDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/RawTransactionValueGroupDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/SpendingOverTimeDTO.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/SpendingOverTimeDTO.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/persistence/dtos/SpendingOverTimeDTO.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/persistence/dtos/SpendingOverTimeDTO.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/AuthorizationService.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/services/AuthorizationService.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/AuthorizationService.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/services/AuthorizationService.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/CategoryService.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/services/CategoryService.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/CategoryService.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/services/CategoryService.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/ProcessedTransactionService.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/services/ProcessedTransactionService.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/ProcessedTransactionService.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/services/ProcessedTransactionService.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/StatementsService.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/services/StatementsService.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/StatementsService.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/services/StatementsService.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/StatisticsService.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/services/StatisticsService.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/StatisticsService.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/services/StatisticsService.java
diff --git a/PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/WidgetService.java b/pefi-monolith/src/main/java/dev/mvvasilev/finances/services/WidgetService.java
similarity index 100%
rename from PersonalFinancesService/src/main/java/dev/mvvasilev/finances/services/WidgetService.java
rename to pefi-monolith/src/main/java/dev/mvvasilev/finances/services/WidgetService.java
diff --git a/PersonalFinancesService/src/main/resources/application.properties b/pefi-monolith/src/main/resources/application.properties
similarity index 100%
rename from PersonalFinancesService/src/main/resources/application.properties
rename to pefi-monolith/src/main/resources/application.properties
diff --git a/PersonalFinancesService/src/main/resources/db/migration/.gitkeep b/pefi-monolith/src/main/resources/db/migration/.gitkeep
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/.gitkeep
rename to pefi-monolith/src/main/resources/db/migration/.gitkeep
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.0__CreateTransactionTables.sql b/pefi-monolith/src/main/resources/db/migration/V1.0__CreateTransactionTables.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.0__CreateTransactionTables.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.0__CreateTransactionTables.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.10__CreateProcessedTransactionCategory.sql b/pefi-monolith/src/main/resources/db/migration/V1.10__CreateProcessedTransactionCategory.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.10__CreateProcessedTransactionCategory.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.10__CreateProcessedTransactionCategory.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.11__CreateTransactionMapping.sql b/pefi-monolith/src/main/resources/db/migration/V1.11__CreateTransactionMapping.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.11__CreateTransactionMapping.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.11__CreateTransactionMapping.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.12__CreateCategorization.sql b/pefi-monolith/src/main/resources/db/migration/V1.12__CreateCategorization.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.12__CreateCategorization.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.12__CreateCategorization.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.13__AddMappingConversions.sql b/pefi-monolith/src/main/resources/db/migration/V1.13__AddMappingConversions.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.13__AddMappingConversions.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.13__AddMappingConversions.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.14__RemoveStatementIdFromMapping.sql b/pefi-monolith/src/main/resources/db/migration/V1.14__RemoveStatementIdFromMapping.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.14__RemoveStatementIdFromMapping.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.14__RemoveStatementIdFromMapping.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.15__AddCategoryRuleBehavior.sql b/pefi-monolith/src/main/resources/db/migration/V1.15__AddCategoryRuleBehavior.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.15__AddCategoryRuleBehavior.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.15__AddCategoryRuleBehavior.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.16__AddCategorizationIsRoot.sql b/pefi-monolith/src/main/resources/db/migration/V1.16__AddCategorizationIsRoot.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.16__AddCategorizationIsRoot.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.16__AddCategorizationIsRoot.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.17__AddSpendingOverTimeFunction.sql b/pefi-monolith/src/main/resources/db/migration/V1.17__AddSpendingOverTimeFunction.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.17__AddSpendingOverTimeFunction.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.17__AddSpendingOverTimeFunction.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.18__AddWidget.sql b/pefi-monolith/src/main/resources/db/migration/V1.18__AddWidget.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.18__AddWidget.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.18__AddWidget.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.19__AddWidgetParameter.sql b/pefi-monolith/src/main/resources/db/migration/V1.19__AddWidgetParameter.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.19__AddWidgetParameter.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.19__AddWidgetParameter.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.1__AddUserIdToRawStatement.sql b/pefi-monolith/src/main/resources/db/migration/V1.1__AddUserIdToRawStatement.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.1__AddUserIdToRawStatement.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.1__AddUserIdToRawStatement.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.20__MakeCategorizationFKCascade.sql b/pefi-monolith/src/main/resources/db/migration/V1.20__MakeCategorizationFKCascade.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.20__MakeCategorizationFKCascade.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.20__MakeCategorizationFKCascade.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.2__AddBooleanValueToRawTransactionValue.sql b/pefi-monolith/src/main/resources/db/migration/V1.2__AddBooleanValueToRawTransactionValue.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.2__AddBooleanValueToRawTransactionValue.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.2__AddBooleanValueToRawTransactionValue.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.3__AddTransactionCategory.sql b/pefi-monolith/src/main/resources/db/migration/V1.3__AddTransactionCategory.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.3__AddTransactionCategory.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.3__AddTransactionCategory.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.4__AddProcessedTransaction.sql b/pefi-monolith/src/main/resources/db/migration/V1.4__AddProcessedTransaction.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.4__AddProcessedTransaction.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.4__AddProcessedTransaction.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.5__AddUserIdToTransactionCategory.sql b/pefi-monolith/src/main/resources/db/migration/V1.5__AddUserIdToTransactionCategory.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.5__AddUserIdToTransactionCategory.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.5__AddUserIdToTransactionCategory.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.6__AddRowIndexToRawTransactionValue.sql b/pefi-monolith/src/main/resources/db/migration/V1.6__AddRowIndexToRawTransactionValue.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.6__AddRowIndexToRawTransactionValue.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.6__AddRowIndexToRawTransactionValue.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.7__AddNameToRawStatement.sql b/pefi-monolith/src/main/resources/db/migration/V1.7__AddNameToRawStatement.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.7__AddNameToRawStatement.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.7__AddNameToRawStatement.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.8__AddOnDeleteCascadeRawStatement.sql b/pefi-monolith/src/main/resources/db/migration/V1.8__AddOnDeleteCascadeRawStatement.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.8__AddOnDeleteCascadeRawStatement.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.8__AddOnDeleteCascadeRawStatement.sql
diff --git a/PersonalFinancesService/src/main/resources/db/migration/V1.9__AlterProcessedTransaction_RemoveCategoryId.sql b/pefi-monolith/src/main/resources/db/migration/V1.9__AlterProcessedTransaction_RemoveCategoryId.sql
similarity index 100%
rename from PersonalFinancesService/src/main/resources/db/migration/V1.9__AlterProcessedTransaction_RemoveCategoryId.sql
rename to pefi-monolith/src/main/resources/db/migration/V1.9__AlterProcessedTransaction_RemoveCategoryId.sql
diff --git a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/CategorizationBuilder.java b/pefi-monolith/src/test/java/dev/mvvasilev/finances/CategorizationBuilder.java
similarity index 100%
rename from PersonalFinancesService/src/test/java/dev/mvvasilev/finances/CategorizationBuilder.java
rename to pefi-monolith/src/test/java/dev/mvvasilev/finances/CategorizationBuilder.java
diff --git a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/CategoryServiceTests.java b/pefi-monolith/src/test/java/dev/mvvasilev/finances/CategoryServiceTests.java
similarity index 66%
rename from PersonalFinancesService/src/test/java/dev/mvvasilev/finances/CategoryServiceTests.java
rename to pefi-monolith/src/test/java/dev/mvvasilev/finances/CategoryServiceTests.java
index b58c523..17f85db 100644
--- a/PersonalFinancesService/src/test/java/dev/mvvasilev/finances/CategoryServiceTests.java
+++ b/pefi-monolith/src/test/java/dev/mvvasilev/finances/CategoryServiceTests.java
@@ -5,29 +5,33 @@ import dev.mvvasilev.finances.persistence.ProcessedTransactionCategoryRepository
 import dev.mvvasilev.finances.persistence.ProcessedTransactionRepository;
 import dev.mvvasilev.finances.persistence.TransactionCategoryRepository;
 import dev.mvvasilev.finances.services.CategoryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.junit.jupiter.api.BeforeEach;
+import org.mockito.Mock;
 
-@SpringBootTest
 public class CategoryServiceTests {
 
-    @MockBean
+    @Mock
     private TransactionCategoryRepository transactionCategoryRepository;
 
-    @MockBean
+    @Mock
     private CategorizationRepository categorizationRepository;
 
-    @MockBean
+    @Mock
     private ProcessedTransactionRepository processedTransactionRepository;
 
-    @MockBean
+    @Mock
     private ProcessedTransactionCategoryRepository processedTransactionCategoryRepository;
 
-    @Autowired
     private CategoryService service;
 
-    public CategoryServiceTests() {
+    @BeforeEach
+    public void setup() {
+        service = new CategoryService(
+                transactionCategoryRepository,
+                categorizationRepository,
+                processedTransactionRepository,
+                processedTransactionCategoryRepository
+        );
     }
 
 }
diff --git a/settings.gradle b/settings.gradle
index ca2763b..03508c6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
-rootProject.name = 'personal-finances'
-
-include 'PersonalFinancesService'
-include 'APIGateway'
-include 'Common'
+rootProject.name = 'pefi'
 
+include 'pefi-frontend'
+include 'pefi-api-gateway'
+include 'pefi-common'
+include 'pefi-monolith'
\ No newline at end of file