diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..7d6754d
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,21 @@
+name: Java CI
+
+on:
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+
+      - name: Build with Maven
+        run: mvn clean test
diff --git a/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java b/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java
index 794efc6..6b38c48 100644
--- a/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java
+++ b/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java
@@ -1,15 +1,14 @@
 package com.project.authapi.system_log_analyzer;
 
+import com.project.authapi.system_log_analyzer.controller.WelcomeViewFXController;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
-@SpringBootApplication
 public class SystemLogAnalyzerApp extends Application {
 
     private ConfigurableApplicationContext springContext;
@@ -21,9 +20,9 @@ public void init() {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        FXMLLoader loader =  new FXMLLoader(getClass().getResource("/WelcomeView.fxml"));
+        FXMLLoader loader =  new FXMLLoader(getClass().getResource("/view/WelcomeView.fxml"));
         loader.setControllerFactory(springContext::getBean);
-        loader.setController(springContext.getBean(com.project.authapi.system_log_analyzer.controller.LogAnalyzerFXController.class));
+        loader.setController(springContext.getBean(WelcomeViewFXController.class));
         Parent root = loader.load();
 
         Scene scene = new Scene(root);
diff --git a/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java b/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java
index 696eef6..5f772d2 100644
--- a/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java
+++ b/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java
@@ -70,7 +70,7 @@ protected List<LogEvent> call() throws Exception {
 
                 var springContext = com.project.authapi.system_log_analyzer.config.ApplicationContextProvider.getApplicationContext();
 
-                FXMLLoader loader = new FXMLLoader(getClass().getResource("/MainWindow.fxml"));
+                FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/MainWindow.fxml"));
                 loader.setControllerFactory(springContext::getBean);
                 Parent root = loader.load();
 
diff --git a/src/main/java/com/project/authapi/system_log_analyzer/controller/LogAnalyzerFXController.java b/src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java
similarity index 98%
rename from src/main/java/com/project/authapi/system_log_analyzer/controller/LogAnalyzerFXController.java
rename to src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java
index b17d473..4e409b0 100644
--- a/src/main/java/com/project/authapi/system_log_analyzer/controller/LogAnalyzerFXController.java
+++ b/src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java
@@ -22,7 +22,7 @@
 import java.io.IOException;
 
 @Component
-public class LogAnalyzerFXController {
+public class WelcomeViewFXController {
     @FXML private Button scanButton;
     @FXML private TextField logFilesDirField;
     @FXML private TextField reportDirField;
@@ -55,7 +55,7 @@ private void scan(ActionEvent event) throws IOException {
 
         ApplicationContext springContext = ApplicationContextProvider.getApplicationContext();
 
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/LoadingScreen.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/LoadingScreen.fxml"));
         loader.setControllerFactory(springContext::getBean); // <-- magiczna linia
         Parent root = loader.load();
 
diff --git a/src/main/resources/LoadingScreen.fxml b/src/main/resources/view/LoadingScreen.fxml
similarity index 100%
rename from src/main/resources/LoadingScreen.fxml
rename to src/main/resources/view/LoadingScreen.fxml
diff --git a/src/main/resources/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
similarity index 100%
rename from src/main/resources/MainWindow.fxml
rename to src/main/resources/view/MainWindow.fxml
diff --git a/src/main/resources/WelcomeView.fxml b/src/main/resources/view/WelcomeView.fxml
similarity index 100%
rename from src/main/resources/WelcomeView.fxml
rename to src/main/resources/view/WelcomeView.fxml