diff --git a/ChaosGame/pom.xml b/ChaosGame/pom.xml
index 1994815054a6d0dd92d38f4df1d2bab3359d7469..99427ddd439c1256ad238550b04ce2bf9c48dcea 100644
--- a/ChaosGame/pom.xml
+++ b/ChaosGame/pom.xml
@@ -26,11 +26,6 @@
<artifactId>javafx-controls</artifactId>
<version>21.0.1</version>
</dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>21.0.1</version>
- </dependency>
</dependencies>
<build>
@@ -40,23 +35,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <archive>
- <manifest>
- <Main-Class>demo.parallel.MainApp</Main-Class>
- </manifest>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -78,7 +56,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
- <mainClass>demo.parallel.Main</mainClass>
+ <mainClass>edu.ntnu.idatt2003.group6.App</mainClass>
</configuration>
</plugin>
</plugins>
diff --git a/ChaosGame/src/main/java/Main.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/App.java
similarity index 60%
rename from ChaosGame/src/main/java/Main.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/App.java
index 73622ce90400d36124fe4c391317a8c950b5ac8e..424b935f06448ce9b6fc31d8071353d3ca49c1cb 100644
--- a/ChaosGame/src/main/java/Main.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/App.java
@@ -1,4 +1,6 @@
-public class Main {
+package edu.ntnu.idatt2003.group6;
+
+public class App {
public static void main(String[] args) {
System.out.println("Main");
diff --git a/ChaosGame/src/main/java/models/matrix/Matrix2x2.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2.java
similarity index 90%
rename from ChaosGame/src/main/java/models/matrix/Matrix2x2.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2.java
index 50f64883caddc78dd4daa24ca48d0c1532ff4d82..1df814223627af60241beea78bbd334d9245e6a3 100644
--- a/ChaosGame/src/main/java/models/matrix/Matrix2x2.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2.java
@@ -1,7 +1,7 @@
-package models.matrix;
+package edu.ntnu.idatt2003.group6.models.matrix;
-import models.vector.Vector2D;
-import utils.Utils;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.utils.Utils;
/**
* This class represents a 2x2 matrix.It contains the components of the matrix and methods to
diff --git a/ChaosGame/src/main/java/models/transformation/AffineTransform2D.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2D.java
similarity index 87%
rename from ChaosGame/src/main/java/models/transformation/AffineTransform2D.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2D.java
index acb54f61abd1b51ebb98194cc265b81518a4ad28..ce44ac8b2136dba9ebb3e3a350ddf0bbec56fb36 100644
--- a/ChaosGame/src/main/java/models/transformation/AffineTransform2D.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2D.java
@@ -1,7 +1,7 @@
-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
-import models.matrix.Matrix2x2;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
/**
* This class represents an affine transformation in 2D space. It contains a 2x2 matrix and a 2D
diff --git a/ChaosGame/src/main/java/models/transformation/JuliaTransform.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransform.java
similarity index 90%
rename from ChaosGame/src/main/java/models/transformation/JuliaTransform.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransform.java
index e17097b245b4deff7eed50dfd43ae28e5a21f9d2..14b75be821dd92804e33878e17b174d077c25c59 100644
--- a/ChaosGame/src/main/java/models/transformation/JuliaTransform.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransform.java
@@ -1,8 +1,8 @@
-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
-import models.vector.Complex;
-import models.vector.Vector2D;
-import utils.Utils;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.vector.Complex;
+import edu.ntnu.idatt2003.group6.utils.Utils;
/**
* This class represents a Julia transformation in 2D space. It contains a complex number
diff --git a/ChaosGame/src/main/java/models/transformation/Transform2D.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/Transform2D.java
similarity index 79%
rename from ChaosGame/src/main/java/models/transformation/Transform2D.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/Transform2D.java
index cd009ca87f5bb3e4724618fdd88cef227ebdf4d7..a05d1217c2b516658090e0f5282d672e022da5fb 100644
--- a/ChaosGame/src/main/java/models/transformation/Transform2D.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/Transform2D.java
@@ -1,6 +1,6 @@
-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
/**
* This interface represents a 2D transformation.
diff --git a/ChaosGame/src/main/java/models/vector/Complex.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Complex.java
similarity index 96%
rename from ChaosGame/src/main/java/models/vector/Complex.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Complex.java
index b87f47828716186a8cb5343139528c09174f7abb..14d34329727ede7d9164b171b0b3b9e5d359e63c 100644
--- a/ChaosGame/src/main/java/models/vector/Complex.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Complex.java
@@ -1,4 +1,4 @@
-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
/**
* This class represents a complex number in 2D space. It contains the real and imaginary parts of
diff --git a/ChaosGame/src/main/java/models/vector/Vector2D.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Vector2D.java
similarity index 96%
rename from ChaosGame/src/main/java/models/vector/Vector2D.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Vector2D.java
index 89af534f180fa4f7671e2efd862a333c10b7a9b6..2ab5599802e362518760196c23543d506cc70d43 100644
--- a/ChaosGame/src/main/java/models/vector/Vector2D.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Vector2D.java
@@ -1,6 +1,6 @@
-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
-import utils.Utils;
+import edu.ntnu.idatt2003.group6.utils.Utils;
/**
* This class represents a 2D vector. It contains the components of the vector and methods to add,
diff --git a/ChaosGame/src/main/java/utils/Utils.java b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/utils/Utils.java
similarity index 97%
rename from ChaosGame/src/main/java/utils/Utils.java
rename to ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/utils/Utils.java
index db42fdcfba3bc669967e31a45768080ed2c70517..1cce3bd0b098e5da23a4f4dbc168d094c0c5b223 100644
--- a/ChaosGame/src/main/java/utils/Utils.java
+++ b/ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/utils/Utils.java
@@ -1,4 +1,4 @@
-package utils;
+package edu.ntnu.idatt2003.group6.utils;
import java.util.Scanner;
diff --git a/ChaosGame/src/test/java/models/matrix/Matrix2x2Test.java b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2Test.java
similarity index 92%
rename from ChaosGame/src/test/java/models/matrix/Matrix2x2Test.java
rename to ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2Test.java
index de82bd8d43006f8273a7c15f5e4f2c526d31e10a..7e952d40a4d8f7d457350c308cd5c56a038ba933 100644
--- a/ChaosGame/src/test/java/models/matrix/Matrix2x2Test.java
+++ b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2Test.java
@@ -1,10 +1,11 @@
-package models.matrix;
+package edu.ntnu.idatt2003.group6.models.matrix;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
diff --git a/ChaosGame/src/test/java/models/transformation/AffineTransform2DTest.java b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2DTest.java
similarity index 86%
rename from ChaosGame/src/test/java/models/transformation/AffineTransform2DTest.java
rename to ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2DTest.java
index d51883c63fdf1a7a9087339338a6f51b9887c2d4..85f0230ab2244f2fb3c06a0e51e1341e8fe25ac1 100644
--- a/ChaosGame/src/test/java/models/transformation/AffineTransform2DTest.java
+++ b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2DTest.java
@@ -1,11 +1,12 @@
-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
-import models.matrix.Matrix2x2;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
+import edu.ntnu.idatt2003.group6.models.transformation.AffineTransform2D;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
diff --git a/ChaosGame/src/test/java/models/transformation/JuliaTransformTest.java b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransformTest.java
similarity index 88%
rename from ChaosGame/src/test/java/models/transformation/JuliaTransformTest.java
rename to ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransformTest.java
index 24e8d5a4e13ee21621ae40da0e23d7dcac068842..91fdc6d4c0bea3c110a790ef17007175aa3a1ac4 100644
--- a/ChaosGame/src/test/java/models/transformation/JuliaTransformTest.java
+++ b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransformTest.java
@@ -1,9 +1,10 @@
-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
import static org.junit.jupiter.api.Assertions.*;
-import models.vector.Complex;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.transformation.JuliaTransform;
+import edu.ntnu.idatt2003.group6.models.vector.Complex;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
diff --git a/ChaosGame/src/test/java/models/vector/ComplexTest.java b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/ComplexTest.java
similarity index 90%
rename from ChaosGame/src/test/java/models/vector/ComplexTest.java
rename to ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/ComplexTest.java
index e09217aa416864e3dcde17e790ddf0a6b9c4a8b7..d7babbf21113d891c573b43ed4ec5a136b01d590 100644
--- a/ChaosGame/src/test/java/models/vector/ComplexTest.java
+++ b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/ComplexTest.java
@@ -1,9 +1,10 @@
-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
+import edu.ntnu.idatt2003.group6.models.vector.Complex;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
diff --git a/ChaosGame/src/test/java/models/vector/Vector2DTest.java b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/Vector2DTest.java
similarity index 97%
rename from ChaosGame/src/test/java/models/vector/Vector2DTest.java
rename to ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/Vector2DTest.java
index 4095335013d9773443dcc273f9b1b4e11339e97f..5eb9dcb15324430c5c0e708b4b22340ce870f330 100644
--- a/ChaosGame/src/test/java/models/vector/Vector2DTest.java
+++ b/ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/Vector2DTest.java
@@ -1,9 +1,10 @@
-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;