simplify: merge subpackage model into main package

6 files changed, 35 insertions, 9 deletions

diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Combi.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java
index 371eb79..78a1ee0 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Combi.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Jonas Smedegaard <dr@jones.dk>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package dk.biks.bachelorizer.model;
+package dk.biks.bachelorizer;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java
index 985c026..320b36c 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java
@@ -5,8 +5,6 @@ package dk.biks.bachelorizer;
 
 import java.util.List;
 
-import dk.biks.bachelorizer.model.GUI;
-
 /// Bachelorizer - Controller
 public class Control{
 
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/GUI.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
index ca9bd86..695c19c 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/GUI.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
@@ -1,12 +1,10 @@
 // SPDX-FileCopyrightText: 2025 Jonas Smedegaard <dr@jones.dk>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package dk.biks.bachelorizer.model;
+package dk.biks.bachelorizer;
 
 import java.util.ArrayList;
 
-import dk.biks.bachelorizer.model.Person;
-
 /// Bachelorizer - GUI model
 public class GUI{
 
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Person.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Person.java
index 9edb7af..f7eeab3 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Person.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Person.java
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Jonas Smedegaard <dr@jones.dk>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package dk.biks.bachelorizer.model;
+package dk.biks.bachelorizer;
 
 /// Bachelorizer - Person model
 public class Person {
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java
index 7bdc88a..85638c8 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java
@@ -14,8 +14,6 @@ import javafx.scene.layout.VBox;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import dk.biks.bachelorizer.model.GUI;
-
 /// Bachelorizer - JavaFX Window view
 // Class is final to forbid subclassing,
 // because object is passed to controller during instatiation
diff --git a/src/dk.biks.bachelorizer/module-info.java b/src/dk.biks.bachelorizer/module-info.java
new file mode 100644
index 0000000..f9c48d1
--- /dev/null
+++ b/src/dk.biks.bachelorizer/module-info.java
@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: 2025 Jonas Smedegaard <dr@jones.dk>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/// Bachelorizer - bachelor programme registrar
+///
+/// Tool for registering students
+/// for activities in their bachelor programme.
+///
+/// Runner class spawning an interactive or non-interactive application
+/// based on passed arguments
+///
+/// Multi-framework MVC structure inspired by project Криптоанализатор
+/// written by Александр Хмелев <akhmelev@gmail.com>.
+///
+/// * v0.0.1-draft
+///   * initial release, as part of delivery "Portfolio 1"
+///
+/// @version 0.0.1-draft
+/// @see <https://moodle.ruc.dk/mod/assign/view.php?id=523186>
+/// @see <https://github.com/demologin/CryptoAnalyzerLed>
+module dk.biks.bachelorizer {
+	requires javafx.base;
+	requires transitive javafx.controls;
+	requires javafx.graphics;
+
+	// re-export, as types are used in public API
+	requires transitive com.example.portfolio3;
+
+//	opens dk.biks.bachelorizer to javafx.fxml;
+
+	exports dk.biks.bachelorizer;
+}