diff --git a/app/src/main/java/gui/Main.java b/app/src/main/java/gui/Main.java
index 4d17dca..5f5e25e 100644
--- a/app/src/main/java/gui/Main.java
+++ b/app/src/main/java/gui/Main.java
@@ -1,5 +1,7 @@
 package gui;
 
+import gui.constants.Fonts;
+import gui.constants.Images;
 import gui.menu.MainMenu;
 import gui.menu.StateMachine;
 import imgui.app.Application;
diff --git a/app/src/main/java/gui/Fonts.java b/app/src/main/java/gui/constants/Fonts.java
similarity index 98%
rename from app/src/main/java/gui/Fonts.java
rename to app/src/main/java/gui/constants/Fonts.java
index 46d4907..af00876 100644
--- a/app/src/main/java/gui/Fonts.java
+++ b/app/src/main/java/gui/constants/Fonts.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import imgui.ImFont;
 import imgui.ImFontConfig;
diff --git a/app/src/main/java/gui/Images.java b/app/src/main/java/gui/constants/Images.java
similarity index 98%
rename from app/src/main/java/gui/Images.java
rename to app/src/main/java/gui/constants/Images.java
index 3dcafe3..7694756 100644
--- a/app/src/main/java/gui/Images.java
+++ b/app/src/main/java/gui/constants/Images.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import java.nio.ByteBuffer;
 
diff --git a/app/src/main/java/gui/Options.java b/app/src/main/java/gui/constants/Options.java
similarity index 84%
rename from app/src/main/java/gui/Options.java
rename to app/src/main/java/gui/constants/Options.java
index 238f60f..42294f1 100644
--- a/app/src/main/java/gui/Options.java
+++ b/app/src/main/java/gui/constants/Options.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 public class Options {
 
diff --git a/app/src/main/java/gui/SudokuType.java b/app/src/main/java/gui/constants/SudokuType.java
similarity index 98%
rename from app/src/main/java/gui/SudokuType.java
rename to app/src/main/java/gui/constants/SudokuType.java
index 7eb812b..63ed82a 100644
--- a/app/src/main/java/gui/SudokuType.java
+++ b/app/src/main/java/gui/constants/SudokuType.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import java.util.List;
 
diff --git a/app/src/main/java/gui/Symbols.java b/app/src/main/java/gui/constants/Symbols.java
similarity index 98%
rename from app/src/main/java/gui/Symbols.java
rename to app/src/main/java/gui/constants/Symbols.java
index 082db8b..4bfbffe 100644
--- a/app/src/main/java/gui/Symbols.java
+++ b/app/src/main/java/gui/constants/Symbols.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/gui/menu/OptionsMenu.java b/app/src/main/java/gui/menu/OptionsMenu.java
index 382ee54..f58f2cc 100644
--- a/app/src/main/java/gui/menu/OptionsMenu.java
+++ b/app/src/main/java/gui/menu/OptionsMenu.java
@@ -1,7 +1,7 @@
 package gui.menu;
 
-import gui.Options;
-import gui.Symbols;
+import gui.constants.Options;
+import gui.constants.Symbols;
 import imgui.ImGui;
 import imgui.type.ImInt;
 
diff --git a/app/src/main/java/gui/menu/StateMachine.java b/app/src/main/java/gui/menu/StateMachine.java
index fdf5920..e75e0d8 100644
--- a/app/src/main/java/gui/menu/StateMachine.java
+++ b/app/src/main/java/gui/menu/StateMachine.java
@@ -2,7 +2,7 @@ package gui.menu;
 
 import java.util.Stack;
 
-import gui.AnimatedBackground;
+import gui.widget.AnimatedBackground;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiKey;
diff --git a/app/src/main/java/gui/AnimatedBackground.java b/app/src/main/java/gui/widget/AnimatedBackground.java
similarity index 92%
rename from app/src/main/java/gui/AnimatedBackground.java
rename to app/src/main/java/gui/widget/AnimatedBackground.java
index ebc6f52..a6649a0 100644
--- a/app/src/main/java/gui/AnimatedBackground.java
+++ b/app/src/main/java/gui/widget/AnimatedBackground.java
@@ -1,5 +1,7 @@
-package gui;
+package gui.widget;
 
+import gui.constants.Images;
+import gui.constants.Options;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiWindowFlags;
diff --git a/app/src/main/java/gui/widget/SudokuRenderer.java b/app/src/main/java/gui/widget/SudokuRenderer.java
index e4f1ecd..3f228fc 100644
--- a/app/src/main/java/gui/widget/SudokuRenderer.java
+++ b/app/src/main/java/gui/widget/SudokuRenderer.java
@@ -9,11 +9,11 @@ import java.util.Set;
 import common.ConsumerSignal;
 import common.Signal;
 import gui.ColorGenerator;
-import gui.Fonts;
-import gui.Options;
-import gui.RenderableMultidoku;
-import gui.Symbols;
 import gui.ColorGenerator.Color;
+import gui.RenderableMultidoku;
+import gui.constants.Fonts;
+import gui.constants.Options;
+import gui.constants.Symbols;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;
diff --git a/app/src/main/java/gui/widget/SudokuSelector.java b/app/src/main/java/gui/widget/SudokuSelector.java
index 4a6a1ef..8bf0ad5 100644
--- a/app/src/main/java/gui/widget/SudokuSelector.java
+++ b/app/src/main/java/gui/widget/SudokuSelector.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import common.ConsumerSignal;
-import gui.SudokuType;
+import gui.constants.SudokuType;
 import imgui.ImGui;
 import imgui.extension.imguifiledialog.ImGuiFileDialog;
 import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;
diff --git a/app/src/main/java/sudoku/Main.java b/app/src/main/java/sudoku/Main.java
index ba1e45a..837a2e6 100644
--- a/app/src/main/java/sudoku/Main.java
+++ b/app/src/main/java/sudoku/Main.java
@@ -4,7 +4,7 @@
 package sudoku;
 
 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.ConsoleInterface;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
diff --git a/app/src/main/java/sudoku/io/ConsoleInterface.java b/app/src/main/java/sudoku/io/ConsoleInterface.java
index b633391..5f8b367 100644
--- a/app/src/main/java/sudoku/io/ConsoleInterface.java
+++ b/app/src/main/java/sudoku/io/ConsoleInterface.java
@@ -1,7 +1,7 @@
 package sudoku.io;
 
 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.constraint.*;
 import sudoku.solver.*;
 import sudoku.structure.*;
diff --git a/app/src/main/java/sudoku/io/SudokuPrinter.java b/app/src/main/java/sudoku/io/SudokuPrinter.java
index bc065a2..6c35e99 100644
--- a/app/src/main/java/sudoku/io/SudokuPrinter.java
+++ b/app/src/main/java/sudoku/io/SudokuPrinter.java
@@ -1,7 +1,7 @@
 package sudoku.io;
 
 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
 import sudoku.structure.Sudoku;
diff --git a/app/src/main/java/sudoku/solver/HumanSolver.java b/app/src/main/java/sudoku/solver/HumanSolver.java
index c4f9196..ba207a1 100644
--- a/app/src/main/java/sudoku/solver/HumanSolver.java
+++ b/app/src/main/java/sudoku/solver/HumanSolver.java
@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
diff --git a/app/src/main/java/sudoku/solver/MixedSolver.java b/app/src/main/java/sudoku/solver/MixedSolver.java
index db0d125..4592405 100644
--- a/app/src/main/java/sudoku/solver/MixedSolver.java
+++ b/app/src/main/java/sudoku/solver/MixedSolver.java
@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
diff --git a/app/src/main/java/sudoku/solver/RandomSolver.java b/app/src/main/java/sudoku/solver/RandomSolver.java
index e1574d3..6853856 100644
--- a/app/src/main/java/sudoku/solver/RandomSolver.java
+++ b/app/src/main/java/sudoku/solver/RandomSolver.java
@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
diff --git a/app/src/test/java/sudoku/solver/SolverTest.java b/app/src/test/java/sudoku/solver/SolverTest.java
index 83718ec..34175c5 100644
--- a/app/src/test/java/sudoku/solver/SolverTest.java
+++ b/app/src/test/java/sudoku/solver/SolverTest.java
@@ -1,7 +1,8 @@
 package sudoku.solver;
 
-import gui.Symbols;
 import org.junit.jupiter.api.Test;
+
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
 import sudoku.structure.Cell;