From 6efc71e6460e58ac4c045fc0dd8a3c05955ed817 Mon Sep 17 00:00:00 2001
From: Joshua Perry <45966243+jpez-development@users.noreply.github.com>
Date: Tue, 31 Jan 2023 17:19:32 +0000
Subject: [PATCH] started gui

---
 .project                                      |  4 +-
 pom.xml                                       | 53 ++++++++++++++-----
 .../{org => com}/r0r5chach/Competitor.java    |  2 +-
 .../r0r5chach/CompetitorList.java             | 16 +++---
 src/main/java/com/r0r5chach/Main.java         | 33 ++++++++++++
 .../java/com/r0r5chach/MainController.java    | 20 +++++++
 .../java/{org => com}/r0r5chach/Manager.java  | 10 ++--
 .../java/{org => com}/r0r5chach/Name.java     |  2 +-
 .../java/{org => com}/r0r5chach/Rank.java     |  2 +-
 .../{org => com}/r0r5chach/r6/R6Attacker.java |  2 +-
 .../{org => com}/r0r5chach/r6/R6Defender.java |  2 +-
 .../{org => com}/r0r5chach/r6/R6Player.java   |  8 +--
 .../r0r5chach/valorant/ValorantAgent.java     |  2 +-
 .../r0r5chach/valorant/ValorantPlayer.java    |  8 +--
 src/main/java/module-info.java                |  9 ++++
 src/main/java/org/r0r5chach/Main.java         | 17 ------
 src/main/resources/com/r0r5chach/main.fxml    | 22 ++++++++
 .../{ => com/r0r5chach}/report.template       |  0
 .../resources/{ => com/r0r5chach}/report0.txt |  0
 .../java/{ => com/r0r5chach}/MainTest.java    |  2 +-
 .../java/{ => com/r0r5chach}/ManagerTest.java |  2 +-
 .../java/{ => com/r0r5chach}/NameTest.java    |  2 +-
 .../java/{ => com/r0r5chach}/RankTest.java    |  2 +-
 .../r0r5chach}/ValorantAgentTest.java         |  3 +-
 .../r0r5chach}/ValorantPlayerTest.java        |  7 ++-
 .../java/{ => com/r0r5chach}/reportTest.txt   |  0
 26 files changed, 163 insertions(+), 67 deletions(-)
 rename src/main/java/{org => com}/r0r5chach/Competitor.java (99%)
 rename src/main/java/{org => com}/r0r5chach/CompetitorList.java (94%)
 create mode 100644 src/main/java/com/r0r5chach/Main.java
 create mode 100644 src/main/java/com/r0r5chach/MainController.java
 rename src/main/java/{org => com}/r0r5chach/Manager.java (72%)
 rename src/main/java/{org => com}/r0r5chach/Name.java (99%)
 rename src/main/java/{org => com}/r0r5chach/Rank.java (96%)
 rename src/main/java/{org => com}/r0r5chach/r6/R6Attacker.java (96%)
 rename src/main/java/{org => com}/r0r5chach/r6/R6Defender.java (96%)
 rename src/main/java/{org => com}/r0r5chach/r6/R6Player.java (92%)
 rename src/main/java/{org => com}/r0r5chach/valorant/ValorantAgent.java (95%)
 rename src/main/java/{org => com}/r0r5chach/valorant/ValorantPlayer.java (94%)
 create mode 100644 src/main/java/module-info.java
 delete mode 100644 src/main/java/org/r0r5chach/Main.java
 create mode 100644 src/main/resources/com/r0r5chach/main.fxml
 rename src/main/resources/{ => com/r0r5chach}/report.template (100%)
 rename src/main/resources/{ => com/r0r5chach}/report0.txt (100%)
 rename src/test/java/{ => com/r0r5chach}/MainTest.java (96%)
 rename src/test/java/{ => com/r0r5chach}/ManagerTest.java (96%)
 rename src/test/java/{ => com/r0r5chach}/NameTest.java (99%)
 rename src/test/java/{ => com/r0r5chach}/RankTest.java (90%)
 rename src/test/java/{ => com/r0r5chach}/ValorantAgentTest.java (81%)
 rename src/test/java/{ => com/r0r5chach}/ValorantPlayerTest.java (96%)
 rename src/test/java/{ => com/r0r5chach}/reportTest.txt (100%)

diff --git a/.project b/.project
index 494cbd4..f3cede1 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>assignment_2</name>
+	<name>app</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -22,7 +22,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1675021093357</id>
+			<id>1675085397960</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
diff --git a/pom.xml b/pom.xml
index 98ffe38..2888d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,25 @@
-<?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">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.r0r5chach</groupId>
-    <artifactId>assignment_2</artifactId>
+    <groupId>com.r0r5chach</groupId>
+    <artifactId>app</artifactId>
     <version>1.0-SNAPSHOT</version>
-
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>17.0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>17.0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -27,5 +32,29 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-</project>
\ No newline at end of file
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <release>17</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <configuration>
+                            <mainClass>com.r0r5chach.App</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/org/r0r5chach/Competitor.java b/src/main/java/com/r0r5chach/Competitor.java
similarity index 99%
rename from src/main/java/org/r0r5chach/Competitor.java
rename to src/main/java/com/r0r5chach/Competitor.java
index f61fccb..bdb3aea 100644
--- a/src/main/java/org/r0r5chach/Competitor.java
+++ b/src/main/java/com/r0r5chach/Competitor.java
@@ -1,4 +1,4 @@
-package org.r0r5chach;
+package com.r0r5chach;
 
 import java.text.DecimalFormat;
 /**
diff --git a/src/main/java/org/r0r5chach/CompetitorList.java b/src/main/java/com/r0r5chach/CompetitorList.java
similarity index 94%
rename from src/main/java/org/r0r5chach/CompetitorList.java
rename to src/main/java/com/r0r5chach/CompetitorList.java
index 15800f7..163bde5 100644
--- a/src/main/java/org/r0r5chach/CompetitorList.java
+++ b/src/main/java/com/r0r5chach/CompetitorList.java
@@ -1,4 +1,4 @@
-package org.r0r5chach;
+package com.r0r5chach;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -11,11 +11,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Scanner;
 
-import org.r0r5chach.r6.R6Attacker;
-import org.r0r5chach.r6.R6Defender;
-import org.r0r5chach.r6.R6Player;
-import org.r0r5chach.valorant.ValorantAgent;
-import org.r0r5chach.valorant.ValorantPlayer;
+import com.r0r5chach.r6.R6Attacker;
+import com.r0r5chach.r6.R6Defender;
+import com.r0r5chach.r6.R6Player;
+import com.r0r5chach.valorant.ValorantAgent;
+import com.r0r5chach.valorant.ValorantPlayer;
 
 
 public class CompetitorList {
@@ -164,7 +164,7 @@ public class CompetitorList {
         FileWriter report = null;
 
         do {
-            path = Path.of("src/main/resources/report"+count+ ".txt");
+            path = Path.of("src/main/resources/com/r0r5chach/report"+count+ ".txt");
             exists = Files.exists(path);
 
             if(exists) {
@@ -201,7 +201,7 @@ public class CompetitorList {
     }
 
     private String reportTemplate() throws IOException {
-        return Files.readString(Path.of("src/main/resources/report.template"));
+        return Files.readString(Path.of("src/main/resources/com/r0r5chach/report.template"));
         
     }
 
diff --git a/src/main/java/com/r0r5chach/Main.java b/src/main/java/com/r0r5chach/Main.java
new file mode 100644
index 0000000..647d94a
--- /dev/null
+++ b/src/main/java/com/r0r5chach/Main.java
@@ -0,0 +1,33 @@
+package com.r0r5chach;
+
+
+import java.io.IOException;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.stage.Stage;
+import javafx.scene.Scene;
+
+public class Main extends Application {
+    private static Scene scene;
+
+    @Override
+    public void start(Stage stage) throws IOException {
+        scene = new Scene(loadFXML("main"), 640, 480);
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    public static void setRoot(String fxml) throws IOException {
+        scene.setRoot(loadFXML(fxml));
+    }
+
+    private static Parent loadFXML(String fxml) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource(fxml + ".fxml"));
+        return fxmlLoader.load();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/r0r5chach/MainController.java b/src/main/java/com/r0r5chach/MainController.java
new file mode 100644
index 0000000..af44750
--- /dev/null
+++ b/src/main/java/com/r0r5chach/MainController.java
@@ -0,0 +1,20 @@
+package com.r0r5chach;
+
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
+
+public class MainController {
+    private CompetitorList competitors;
+
+    @FXML
+    private ListView<Competitor> competitorsList;
+    public MainController() {
+        loadCompetitors();
+    }
+
+    private void loadCompetitors(){
+        this.competitors = new Manager().getCompetitors();
+        this.competitorsList = new ListView<Competitor>(FXCollections.observableList(this.competitors.getCompetitors()));
+    }
+}
diff --git a/src/main/java/org/r0r5chach/Manager.java b/src/main/java/com/r0r5chach/Manager.java
similarity index 72%
rename from src/main/java/org/r0r5chach/Manager.java
rename to src/main/java/com/r0r5chach/Manager.java
index c085798..4efa8ab 100644
--- a/src/main/java/org/r0r5chach/Manager.java
+++ b/src/main/java/com/r0r5chach/Manager.java
@@ -1,7 +1,7 @@
-package org.r0r5chach;
+package com.r0r5chach;
 import java.io.File;
 
-import static org.r0r5chach.CompetitorList.createErrorLog;
+import static com.r0r5chach.CompetitorList.createErrorLog;
 
 public class Manager {
 
@@ -23,14 +23,14 @@ public class Manager {
             report = competitors.createReportFile();
         }
         catch (Exception e) {
-                report = new File(createErrorLog(e, "src/main/resource/log.txt"));
+                report = new File(createErrorLog(e, "src/main/resource/com/r0r5chach/log.txt"));
         }
         return report;
     }
 
     private void init() {
-        File valorantPlayers = new File("src/main/resources/valorantPlayers.txt");
-        File r6Players = new File("src/main/resources/r6Players.txt");
+        File valorantPlayers = new File("src/main/resources/com/r0r5chach/valorantPlayers.txt");
+        File r6Players = new File("src/main/resources/com/r0r5chach/r6Players.txt");
         try {
             competitors = new CompetitorList();
             competitors.readCompetitors(valorantPlayers);
diff --git a/src/main/java/org/r0r5chach/Name.java b/src/main/java/com/r0r5chach/Name.java
similarity index 99%
rename from src/main/java/org/r0r5chach/Name.java
rename to src/main/java/com/r0r5chach/Name.java
index 1629900..9a53689 100644
--- a/src/main/java/org/r0r5chach/Name.java
+++ b/src/main/java/com/r0r5chach/Name.java
@@ -1,4 +1,4 @@
-package org.r0r5chach;
+package com.r0r5chach;
 
 /**
  * Class that defines a name and it's parts
diff --git a/src/main/java/org/r0r5chach/Rank.java b/src/main/java/com/r0r5chach/Rank.java
similarity index 96%
rename from src/main/java/org/r0r5chach/Rank.java
rename to src/main/java/com/r0r5chach/Rank.java
index f24aea5..f41573d 100644
--- a/src/main/java/org/r0r5chach/Rank.java
+++ b/src/main/java/com/r0r5chach/Rank.java
@@ -1,4 +1,4 @@
-package org.r0r5chach;
+package com.r0r5chach;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/r0r5chach/r6/R6Attacker.java b/src/main/java/com/r0r5chach/r6/R6Attacker.java
similarity index 96%
rename from src/main/java/org/r0r5chach/r6/R6Attacker.java
rename to src/main/java/com/r0r5chach/r6/R6Attacker.java
index 30baa83..e82052e 100644
--- a/src/main/java/org/r0r5chach/r6/R6Attacker.java
+++ b/src/main/java/com/r0r5chach/r6/R6Attacker.java
@@ -1,4 +1,4 @@
-package org.r0r5chach.r6;
+package com.r0r5chach.r6;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/r0r5chach/r6/R6Defender.java b/src/main/java/com/r0r5chach/r6/R6Defender.java
similarity index 96%
rename from src/main/java/org/r0r5chach/r6/R6Defender.java
rename to src/main/java/com/r0r5chach/r6/R6Defender.java
index bd6eceb..6bdc55e 100644
--- a/src/main/java/org/r0r5chach/r6/R6Defender.java
+++ b/src/main/java/com/r0r5chach/r6/R6Defender.java
@@ -1,4 +1,4 @@
-package org.r0r5chach.r6;
+package com.r0r5chach.r6;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/r0r5chach/r6/R6Player.java b/src/main/java/com/r0r5chach/r6/R6Player.java
similarity index 92%
rename from src/main/java/org/r0r5chach/r6/R6Player.java
rename to src/main/java/com/r0r5chach/r6/R6Player.java
index c55ba3a..a5482e2 100644
--- a/src/main/java/org/r0r5chach/r6/R6Player.java
+++ b/src/main/java/com/r0r5chach/r6/R6Player.java
@@ -1,10 +1,10 @@
-package org.r0r5chach.r6;
+package com.r0r5chach.r6;
 
 import java.util.Arrays;
 
-import org.r0r5chach.Competitor;
-import org.r0r5chach.Name;
-import org.r0r5chach.Rank;
+import com.r0r5chach.Competitor;
+import com.r0r5chach.Name;
+import com.r0r5chach.Rank;
 
 public class R6Player extends Competitor{
     private R6Attacker favoriteAttacker;
diff --git a/src/main/java/org/r0r5chach/valorant/ValorantAgent.java b/src/main/java/com/r0r5chach/valorant/ValorantAgent.java
similarity index 95%
rename from src/main/java/org/r0r5chach/valorant/ValorantAgent.java
rename to src/main/java/com/r0r5chach/valorant/ValorantAgent.java
index 0d80360..72c1c95 100644
--- a/src/main/java/org/r0r5chach/valorant/ValorantAgent.java
+++ b/src/main/java/com/r0r5chach/valorant/ValorantAgent.java
@@ -1,4 +1,4 @@
-package org.r0r5chach.valorant;
+package com.r0r5chach.valorant;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/r0r5chach/valorant/ValorantPlayer.java b/src/main/java/com/r0r5chach/valorant/ValorantPlayer.java
similarity index 94%
rename from src/main/java/org/r0r5chach/valorant/ValorantPlayer.java
rename to src/main/java/com/r0r5chach/valorant/ValorantPlayer.java
index f928e10..c7918b8 100644
--- a/src/main/java/org/r0r5chach/valorant/ValorantPlayer.java
+++ b/src/main/java/com/r0r5chach/valorant/ValorantPlayer.java
@@ -1,10 +1,10 @@
-package org.r0r5chach.valorant;
+package com.r0r5chach.valorant;
 
 import java.util.Arrays;
 
-import org.r0r5chach.Competitor;
-import org.r0r5chach.Name;
-import org.r0r5chach.Rank;
+import com.r0r5chach.Competitor;
+import com.r0r5chach.Name;
+import com.r0r5chach.Rank;
 /**
  * Class that defines the various attributes and methods associated with a Valorant Player
  * @author r0r5chach
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..f2a5e82
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module com.r0r5chach {
+    requires transitive javafx.graphics;
+
+    requires javafx.controls;
+    requires javafx.fxml;
+
+    opens com.r0r5chach to javafx.fxml;
+    exports com.r0r5chach;
+}
diff --git a/src/main/java/org/r0r5chach/Main.java b/src/main/java/org/r0r5chach/Main.java
deleted file mode 100644
index 8b28bb5..0000000
--- a/src/main/java/org/r0r5chach/Main.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.r0r5chach;
-
-
-import java.io.IOException;
-import java.nio.file.Files;
-
-public class Main {
-    public static void main(String[] args) {
-        Manager manager = new Manager();
-        try {
-            System.out.println(Files.readString(manager.getReport().toPath()));
-        }
-        catch (IOException e) {
-            System.out.println("reading error");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/com/r0r5chach/main.fxml b/src/main/resources/com/r0r5chach/main.fxml
new file mode 100644
index 0000000..b0f3a52
--- /dev/null
+++ b/src/main/resources/com/r0r5chach/main.fxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <SplitPane dividerPositions="0.29797979797979796" prefHeight="452.0" prefWidth="600.0">
+        <items>
+          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+               <children>
+                  <ListView fx:id="competitors" prefHeight="398.0" prefWidth="175.0" />
+               </children>
+            </AnchorPane>
+          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
+        </items>
+      </SplitPane>
+   </children>
+</VBox>
diff --git a/src/main/resources/report.template b/src/main/resources/com/r0r5chach/report.template
similarity index 100%
rename from src/main/resources/report.template
rename to src/main/resources/com/r0r5chach/report.template
diff --git a/src/main/resources/report0.txt b/src/main/resources/com/r0r5chach/report0.txt
similarity index 100%
rename from src/main/resources/report0.txt
rename to src/main/resources/com/r0r5chach/report0.txt
diff --git a/src/test/java/MainTest.java b/src/test/java/com/r0r5chach/MainTest.java
similarity index 96%
rename from src/test/java/MainTest.java
rename to src/test/java/com/r0r5chach/MainTest.java
index b8608df..dff875e 100644
--- a/src/test/java/MainTest.java
+++ b/src/test/java/com/r0r5chach/MainTest.java
@@ -1,6 +1,6 @@
+package com.r0r5chach;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import org.r0r5chach.Main;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/test/java/ManagerTest.java b/src/test/java/com/r0r5chach/ManagerTest.java
similarity index 96%
rename from src/test/java/ManagerTest.java
rename to src/test/java/com/r0r5chach/ManagerTest.java
index 00c10c4..f471a7d 100644
--- a/src/test/java/ManagerTest.java
+++ b/src/test/java/com/r0r5chach/ManagerTest.java
@@ -1,6 +1,6 @@
+package com.r0r5chach;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import org.r0r5chach.Manager;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/test/java/NameTest.java b/src/test/java/com/r0r5chach/NameTest.java
similarity index 99%
rename from src/test/java/NameTest.java
rename to src/test/java/com/r0r5chach/NameTest.java
index 9a77ea6..45d99fd 100644
--- a/src/test/java/NameTest.java
+++ b/src/test/java/com/r0r5chach/NameTest.java
@@ -1,5 +1,5 @@
+package com.r0r5chach;
 import org.junit.jupiter.api.Test;
-import org.r0r5chach.Name;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/RankTest.java b/src/test/java/com/r0r5chach/RankTest.java
similarity index 90%
rename from src/test/java/RankTest.java
rename to src/test/java/com/r0r5chach/RankTest.java
index 7e35e07..c1de030 100644
--- a/src/test/java/RankTest.java
+++ b/src/test/java/com/r0r5chach/RankTest.java
@@ -1,6 +1,6 @@
+package com.r0r5chach;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import org.r0r5chach.Rank;
 
 
 public class RankTest {
diff --git a/src/test/java/ValorantAgentTest.java b/src/test/java/com/r0r5chach/ValorantAgentTest.java
similarity index 81%
rename from src/test/java/ValorantAgentTest.java
rename to src/test/java/com/r0r5chach/ValorantAgentTest.java
index fa283d4..a55750e 100644
--- a/src/test/java/ValorantAgentTest.java
+++ b/src/test/java/com/r0r5chach/ValorantAgentTest.java
@@ -1,6 +1,7 @@
+package com.r0r5chach;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import org.r0r5chach.valorant.ValorantAgent;
+import com.r0r5chach.valorant.ValorantAgent;
 
 public class ValorantAgentTest {
     @Test
diff --git a/src/test/java/ValorantPlayerTest.java b/src/test/java/com/r0r5chach/ValorantPlayerTest.java
similarity index 96%
rename from src/test/java/ValorantPlayerTest.java
rename to src/test/java/com/r0r5chach/ValorantPlayerTest.java
index c2ea5be..afe625f 100644
--- a/src/test/java/ValorantPlayerTest.java
+++ b/src/test/java/com/r0r5chach/ValorantPlayerTest.java
@@ -1,9 +1,8 @@
+package com.r0r5chach;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import org.r0r5chach.Name;
-import org.r0r5chach.Rank;
-import org.r0r5chach.valorant.ValorantAgent;
-import org.r0r5chach.valorant.ValorantPlayer;
+import com.r0r5chach.valorant.ValorantAgent;
+import com.r0r5chach.valorant.ValorantPlayer;
 public class ValorantPlayerTest {
     @Test
     public void valorantPlayerTest() {
diff --git a/src/test/java/reportTest.txt b/src/test/java/com/r0r5chach/reportTest.txt
similarity index 100%
rename from src/test/java/reportTest.txt
rename to src/test/java/com/r0r5chach/reportTest.txt