feat: solution

src/main/java/lab/Boat.java → java2-lab02-v3/src/main/java/lab/game/Boat.java

-package lab;
+package lab.game;
 
 import java.util.Random;
 

src/main/java/lab/Collisionable.java → java2-lab02-v3/src/main/java/lab/game/Collisionable.java

-package lab;
+package lab.game;
 
 import javafx.geometry.Rectangle2D;
 

src/main/java/lab/DeadListener.java → java2-lab02-v3/src/main/java/lab/game/DeadListener.java

-package lab;
+package lab.game;
 
 public interface DeadListener {
 	void lochnessDead();

src/main/java/lab/Difficult.java → java2-lab02-v3/src/main/java/lab/game/Difficult.java

-package lab;
+package lab.game;
 
 public enum Difficult {
 	EASY(2), MEDIUM(5), HARD(10);

src/main/java/lab/DrawableSimulable.java → java2-lab02-v3/src/main/java/lab/game/DrawableSimulable.java

-package lab;
+package lab.game;
 
 import javafx.scene.canvas.GraphicsContext;
 

src/main/java/lab/DrawingThread.java → java2-lab02-v3/src/main/java/lab/game/DrawingThread.java

-package lab;
+package lab.game;
 
 import javafx.animation.AnimationTimer;
 import javafx.scene.canvas.Canvas;

src/main/java/lab/LochNess.java → java2-lab02-v3/src/main/java/lab/game/LochNess.java

-package lab;
+package lab.game;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/lab/Rock.java → java2-lab02-v3/src/main/java/lab/game/Rock.java

-package lab;
+package lab.game;
 
 import java.util.Random;
 

src/main/java/lab/Routines.java → java2-lab02-v3/src/main/java/lab/game/Routines.java

-package lab;
+package lab.game;
 
 public class Routines {
 

src/main/java/lab/Scene.java → java2-lab02-v3/src/main/java/lab/game/Scene.java

-package lab;
+package lab.game;
 
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/lab/WorldEntity.java → java2-lab02-v3/src/main/java/lab/game/WorldEntity.java

-package lab;
+package lab.game;
 
 import javafx.geometry.Point2D;
 import javafx.scene.canvas.GraphicsContext;

src/main/java/lab/App.java → java2-lab02-v3/src/main/java/lab/gui/App.java

-package lab;
+package lab.gui;
 
 import java.io.IOException;
 import java.net.URL;
@@ -42,7 +42,7 @@ public class App extends Application {
 
 	public void switchToGame(String name, int numberOfMonsters) throws IOException {
 		// Construct a main window with a canvas.
-		FXMLLoader gameLoader = new FXMLLoader(getClass().getResource("/lab/gameWindow.fxml"));
+		FXMLLoader gameLoader = new FXMLLoader(getClass().getResource("/lab/gui/gameWindow.fxml"));
 		Parent root = gameLoader.load();
 		gameController = gameLoader.getController();
 		Scene scene = new Scene(root);
@@ -53,7 +53,7 @@ public class App extends Application {
 	}
 	private void switchToMenu() throws IOException {
 		// Construct a main window with a canvas.
-		FXMLLoader menuLoader = new FXMLLoader(getClass().getResource("/lab/mainScreen.fxml"));
+		FXMLLoader menuLoader = new FXMLLoader(getClass().getResource("/lab/gui/mainScreen.fxml"));
 		Parent root = menuLoader.load();
 		MainScreenController menuController = menuLoader.getController();
 		menuController.setApp(this);

src/main/java/lab/GameController.java → java2-lab02-v3/src/main/java/lab/gui/GameController.java

-package lab;
+package lab.gui;
 
 import java.util.List;
 
+import cz.vsb.fei.java2.lab02.common.Score;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
@@ -12,6 +13,10 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Slider;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
+import lab.ScoreStorageFactory;
+import lab.game.DrawingThread;
+import lab.game.LochNess;
+import lab.game.Scene;
 
 public class GameController {
 

src/main/java/lab/MainScreenController.java → java2-lab02-v3/src/main/java/lab/gui/MainScreenController.java

-package lab;
+package lab.gui;
 
 import java.io.IOException;
 import java.util.List;
 
+import cz.vsb.fei.java2.lab02.common.Score;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -12,6 +13,8 @@ import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.cell.PropertyValueFactory;
+import lab.ScoreStorageFactory;
+import lab.game.Difficult;
 
 /**
  * 
@@ -100,7 +103,6 @@ public class MainScreenController {
 	}
 
 	private void initDB() {
-		// Stream.generate(Score::generate).limit(10).toList();
 		ScoreStorageFactory.getInstance().init();
 		scores.getItems().addAll(ScoreStorageFactory.getInstance().getAll());
 	}

src/main/java/module-info.java → java2-lab02-v3/src/main/java/module-info.java

+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+
 module lab01 {
     requires transitive javafx.controls;
     requires javafx.fxml;
     requires javafx.base;
-    requires java.sql;
-    opens lab to javafx.fxml;
-    exports lab;
+	requires cz.vsb.fei.java2.lab02.common_module;
+    opens lab.gui to javafx.fxml;
+    exports lab.gui to javafx.fxml,javafx.graphics;
+    uses ScoreStorageInterface;
 }
\ No newline at end of file