From b834072a1d45f39bf6211982de50822d4d624700 Mon Sep 17 00:00:00 2001
From: mkpaz <quizynox@gmail.com>
Date: Sat, 27 May 2023 21:33:16 +0400
Subject: [PATCH] Refactor assets/resources

---
 .../java/atlantafx/sampler/layout/MainModel.java    |   2 +-
 .../sampler/page/components/AccordionPage.java      |   2 +-
 .../atlantafx/sampler/page/components/TilePage.java |   4 +---
 .../{components => general}/AnimationsPage.java     |   6 +++---
 .../sampler/page/general/SceneBuilderDialog.java    |   8 ++++----
 .../atlantafx/sampler/page/general/ThemePage.java   |   2 +-
 .../sampler/page/showcase/BlueprintsPage.java       |   2 +-
 .../sampler/page/showcase/OverviewPage.java         |   2 +-
 .../{assets => }/fxml/blueprints/button-list.fxml   |   2 +-
 .../{assets => }/fxml/blueprints/calendar.fxml      |   0
 .../fxml/blueprints/checklist-proposal.fxml         |   6 +++---
 .../fxml/blueprints/dimensions-table.fxml           |   0
 .../sampler/{assets => }/fxml/blueprints/index.fxml |   0
 .../fxml/blueprints/message-editor.fxml             |   0
 .../{assets => }/fxml/blueprints/music-player.fxml  |   8 ++++----
 .../{assets => }/fxml/blueprints/share-project.fxml |   8 ++++----
 .../sampler/{assets => }/fxml/overview.fxml         |   0
 .../album_covers}/accept_blind-rage.png             | Bin
 .../album_covers}/opeth_blackwater-park.png         | Bin
 .../album_covers}/rainbow_rising.png                | Bin
 .../album_covers}/soen_lotus.png                    | Bin
 .../resources => images/avatars}/avatar1.png        | Bin
 .../resources => images/avatars}/avatar2.png        | Bin
 .../resources => images/avatars}/avatar3.png        | Bin
 .../resources => images/avatars}/avatar4.png        | Bin
 .../resources => images/avatars}/avatar5.png        | Bin
 .../resources => images/avatars}/avatar6.png        | Bin
 .../sampler/images/{ => fun}/20_min_adventure.jpg   | Bin
 .../sampler/images/{ => fun}/saitama-bg.png         | Bin
 .../atlantafx/sampler/images/{ => fun}/saitama.png  | Bin
 .../images/{ => scene-builder}/color-palette.png    | Bin
 .../{ => scene-builder}/scene-builder-in-action.jpg | Bin
 .../{ => scene-builder}/scene-builder-themes.png    | Bin
 .../images/{ => scene-builder}/scene-builder.png    | Bin
 .../images/{ => scene-builder}/scene-builder_32.png | Bin
 35 files changed, 25 insertions(+), 27 deletions(-)
 rename sampler/src/main/java/atlantafx/sampler/page/{components => general}/AnimationsPage.java (98%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/button-list.fxml (97%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/calendar.fxml (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/checklist-proposal.fxml (93%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/dimensions-table.fxml (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/index.fxml (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/message-editor.fxml (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/music-player.fxml (97%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/blueprints/share-project.fxml (92%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets => }/fxml/overview.fxml (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/album_covers}/accept_blind-rage.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/album_covers}/opeth_blackwater-park.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/album_covers}/rainbow_rising.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/album_covers}/soen_lotus.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/avatars}/avatar1.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/avatars}/avatar2.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/avatars}/avatar3.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/avatars}/avatar4.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/avatars}/avatar5.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/{assets/fxml/blueprints/resources => images/avatars}/avatar6.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => fun}/20_min_adventure.jpg (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => fun}/saitama-bg.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => fun}/saitama.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => scene-builder}/color-palette.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => scene-builder}/scene-builder-in-action.jpg (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => scene-builder}/scene-builder-themes.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => scene-builder}/scene-builder.png (100%)
 rename sampler/src/main/resources/atlantafx/sampler/images/{ => scene-builder}/scene-builder_32.png (100%)

diff --git a/sampler/src/main/java/atlantafx/sampler/layout/MainModel.java b/sampler/src/main/java/atlantafx/sampler/layout/MainModel.java
index 4af7f16..e463ba8 100644
--- a/sampler/src/main/java/atlantafx/sampler/layout/MainModel.java
+++ b/sampler/src/main/java/atlantafx/sampler/layout/MainModel.java
@@ -9,7 +9,7 @@ import atlantafx.sampler.event.DefaultEventBus;
 import atlantafx.sampler.event.NavEvent;
 import atlantafx.sampler.page.Page;
 import atlantafx.sampler.page.components.AccordionPage;
-import atlantafx.sampler.page.components.AnimationsPage;
+import atlantafx.sampler.page.general.AnimationsPage;
 import atlantafx.sampler.page.components.BreadcrumbsPage;
 import atlantafx.sampler.page.components.ButtonPage;
 import atlantafx.sampler.page.components.CalendarPage;
diff --git a/sampler/src/main/java/atlantafx/sampler/page/components/AccordionPage.java b/sampler/src/main/java/atlantafx/sampler/page/components/AccordionPage.java
index 2674527..2697d7f 100644
--- a/sampler/src/main/java/atlantafx/sampler/page/components/AccordionPage.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/components/AccordionPage.java
@@ -166,7 +166,7 @@ public final class AccordionPage extends OutlinePage {
         disabledBlock.setDisable(true);
 
         var imageBlock = new TitledPane("_Image", new VBox(10,
-            new ImageView(new Image(Resources.getResourceAsStream("images/20_min_adventure.jpg"))),
+            new ImageView(new Image(Resources.getResourceAsStream("images/fun/20_min_adventure.jpg"))),
             new TextFlow(new Text(FAKER.rickAndMorty().quote()))
         ));
         imageBlock.animatedProperty().bind(animatedProperty);
diff --git a/sampler/src/main/java/atlantafx/sampler/page/components/TilePage.java b/sampler/src/main/java/atlantafx/sampler/page/components/TilePage.java
index f372773..f578858 100644
--- a/sampler/src/main/java/atlantafx/sampler/page/components/TilePage.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/components/TilePage.java
@@ -103,9 +103,7 @@ public class TilePage extends OutlinePage {
         );
 
         var img = new ImageView(new Image(
-            Resources.getResourceAsStream(
-                "assets/fxml/blueprints/resources/avatar1.png"
-            )
+            Resources.getResourceAsStream("images/avatars/avatar1.png")
         ));
         img.setFitWidth(64);
         img.setFitHeight(64);
diff --git a/sampler/src/main/java/atlantafx/sampler/page/components/AnimationsPage.java b/sampler/src/main/java/atlantafx/sampler/page/general/AnimationsPage.java
similarity index 98%
rename from sampler/src/main/java/atlantafx/sampler/page/components/AnimationsPage.java
rename to sampler/src/main/java/atlantafx/sampler/page/general/AnimationsPage.java
index 842411a..0dafb8e 100644
--- a/sampler/src/main/java/atlantafx/sampler/page/components/AnimationsPage.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/general/AnimationsPage.java
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT */
 
-package atlantafx.sampler.page.components;
+package atlantafx.sampler.page.general;
 
 import static javafx.scene.control.ScrollPane.ScrollBarPolicy.AS_NEEDED;
 import static javafx.scene.control.ScrollPane.ScrollBarPolicy.NEVER;
@@ -36,10 +36,10 @@ public final class AnimationsPage extends StackPane implements Page {
     private static final int OUTLINE_WIDTH = 250;
     private static final Duration DURATION = Duration.millis(2000);
     private static final ImageView ANIMATED_NODE = new ImageView(new Image(
-        Resources.getResourceAsStream("images/saitama.png")
+        Resources.getResourceAsStream("images/fun/saitama.png")
     ));
     private static final ImageView ANIMATED_BG = new ImageView(new Image(
-        Resources.getResourceAsStream("images/saitama-bg.png")
+        Resources.getResourceAsStream("images/fun/saitama-bg.png")
     ));
 
     @Override
diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderDialog.java b/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderDialog.java
index 9b0294a..327e581 100644
--- a/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderDialog.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderDialog.java
@@ -153,7 +153,7 @@ class SceneBuilderDialog extends ModalDialog {
 
     private Pane createStartScreen() {
         var previewImg = new ImageView(new Image(
-            Resources.getResourceAsStream("images/scene-builder-in-action.jpg")
+            Resources.getResourceAsStream("images/scene-builder/scene-builder-in-action.jpg")
         ));
         previewImg.setFitWidth(280);
         previewImg.setFitHeight(190);
@@ -257,7 +257,7 @@ class SceneBuilderDialog extends ModalDialog {
 
     private Pane createThemeScreen() {
         var icon = new ImageView(new Image(
-            Resources.getResourceAsStream("images/color-palette.png")
+            Resources.getResourceAsStream("images/scene-builder/color-palette.png")
         ));
         icon.setFitWidth(64);
         icon.setFitHeight(64);
@@ -323,14 +323,14 @@ class SceneBuilderDialog extends ModalDialog {
 
     private Pane createExecScreen() {
         var menuImg = new ImageView(new Image(
-            Resources.getResourceAsStream("images/scene-builder-themes.png")
+            Resources.getResourceAsStream("images/scene-builder/scene-builder-themes.png")
         ));
         menuImg.setFitWidth(280);
         menuImg.setFitHeight(210);
         menuImg.setCursor(Cursor.HAND);
 
         var test = new ImageView(new Image(
-            Resources.getResourceAsStream("images/scene-builder-themes.png")
+            Resources.getResourceAsStream("images/scene-builder/scene-builder-themes.png")
         ));
         test.setPickOnBounds(true);
 
diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/ThemePage.java b/sampler/src/main/java/atlantafx/sampler/page/general/ThemePage.java
index 3635e8f..6796959 100755
--- a/sampler/src/main/java/atlantafx/sampler/page/general/ThemePage.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/general/ThemePage.java
@@ -46,7 +46,7 @@ public final class ThemePage extends OutlinePage {
     private static final ThemeManager TM = ThemeManager.getInstance();
     private static final String DEFAULT_FONT_ID = "Default";
     private static final Image SCENE_BUILDER_ICON = new Image(
-        Resources.getResourceAsStream("images/scene-builder_32.png")
+        Resources.getResourceAsStream("images/scene-builder/scene-builder_32.png")
     );
 
     @Override
diff --git a/sampler/src/main/java/atlantafx/sampler/page/showcase/BlueprintsPage.java b/sampler/src/main/java/atlantafx/sampler/page/showcase/BlueprintsPage.java
index 834ead6..8a90ae3 100755
--- a/sampler/src/main/java/atlantafx/sampler/page/showcase/BlueprintsPage.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/showcase/BlueprintsPage.java
@@ -37,7 +37,7 @@ public final class BlueprintsPage extends ScrollPane implements Page {
             wrapper.setAlignment(Pos.TOP_CENTER);
 
             var loader = new FXMLLoader(
-                Resources.getResource("assets/fxml/blueprints/index.fxml").toURL()
+                Resources.getResource("fxml/blueprints/index.fxml").toURL()
             );
             Parent fxmlContent = loader.load();
             ((Pane) fxmlContent).setMaxWidth(Page.MAX_WIDTH);
diff --git a/sampler/src/main/java/atlantafx/sampler/page/showcase/OverviewPage.java b/sampler/src/main/java/atlantafx/sampler/page/showcase/OverviewPage.java
index 787cfaa..8f5d3ae 100755
--- a/sampler/src/main/java/atlantafx/sampler/page/showcase/OverviewPage.java
+++ b/sampler/src/main/java/atlantafx/sampler/page/showcase/OverviewPage.java
@@ -39,7 +39,7 @@ public final class OverviewPage extends ScrollPane implements Page {
             wrapper.getStyleClass().add(Styles.BG_DEFAULT);
 
             var loader = new FXMLLoader(
-                Resources.getResource("assets/fxml/overview.fxml").toURL()
+                Resources.getResource("fxml/overview.fxml").toURL()
             );
             Parent fxmlContent = loader.load();
             ((Pane) fxmlContent).setMaxWidth(Page.MAX_WIDTH);
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/button-list.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/button-list.fxml
similarity index 97%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/button-list.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/button-list.fxml
index b0ab0d8..196ca8c 100644
--- a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/button-list.fxml
+++ b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/button-list.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="180.0" spacing="10.0" styleClass="sample" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="180.0" spacing="10.0" styleClass="sample" xmlns="http://javafx.com/javafx/19">
    <children>
       <Button defaultButton="true" mnemonicParsing="false" prefWidth="150.0" text="Button">
          <graphic>
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/calendar.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/calendar.fxml
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/calendar.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/calendar.fxml
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/checklist-proposal.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/checklist-proposal.fxml
similarity index 93%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/checklist-proposal.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/checklist-proposal.fxml
index 5e979f1..9fbb539 100644
--- a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/checklist-proposal.fxml
+++ b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/checklist-proposal.fxml
@@ -54,17 +54,17 @@
          <children>
             <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/avatar1.png" />
+                  <Image url="@../../images/avatars/avatar1.png" />
                </image>
             </ImageView>
             <ImageView fitHeight="32.0" fitWidth="32.0" layoutX="10.0" layoutY="10.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/avatar2.png" />
+                  <Image url="@../../images/avatars/avatar2.png" />
                </image>
             </ImageView>
             <ImageView fitHeight="32.0" fitWidth="32.0" layoutX="42.0" layoutY="10.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/avatar3.png" />
+                  <Image url="@../../images/avatars/avatar3.png" />
                </image>
             </ImageView>
             <Spacer />
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/dimensions-table.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/dimensions-table.fxml
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/dimensions-table.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/dimensions-table.fxml
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/index.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/index.fxml
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/index.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/index.fxml
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/message-editor.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/message-editor.fxml
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/message-editor.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/message-editor.fxml
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/music-player.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/music-player.fxml
similarity index 97%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/music-player.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/music-player.fxml
index 4f4786b..799cc0c 100644
--- a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/music-player.fxml
+++ b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/music-player.fxml
@@ -107,7 +107,7 @@
          <children>
             <ImageView fitHeight="80.0" fitWidth="80.0" pickOnBounds="true" preserveRatio="true" GridPane.rowSpan="2147483647">
                <image>
-                  <Image url="@resources/rainbow_rising.png" />
+                  <Image url="@../../images/album_covers/rainbow_rising.png" />
                </image>
             </ImageView>
             <Label styleClass="text-caption" text="A Light in the Black" GridPane.columnIndex="1">
@@ -157,7 +157,7 @@
          <children>
             <ImageView fitHeight="64.0" fitWidth="64.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/accept_blind-rage.png" />
+                  <Image url="@../../images/album_covers/accept_blind-rage.png" />
                </image>
             </ImageView>
             <VBox alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">
@@ -194,7 +194,7 @@
          <children>
             <ImageView fitHeight="64.0" fitWidth="64.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/soen_lotus.png" />
+                  <Image url="@../../images/album_covers/soen_lotus.png" />
                </image>
             </ImageView>
             <VBox alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">
@@ -231,7 +231,7 @@
          <children>
             <ImageView fitHeight="64.0" fitWidth="64.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/opeth_blackwater-park.png" />
+                  <Image url="@../../images/album_covers/opeth_blackwater-park.png" />
                </image>
             </ImageView>
             <VBox alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/share-project.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/share-project.fxml
similarity index 92%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/share-project.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/share-project.fxml
index b57ce27..2734f0c 100644
--- a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/share-project.fxml
+++ b/sampler/src/main/resources/atlantafx/sampler/fxml/blueprints/share-project.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.VBox?>
 
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="350.0" spacing="10.0" styleClass="sample" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="350.0" spacing="10.0" styleClass="sample" xmlns="http://javafx.com/javafx/19">
    <padding>
       <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
    </padding>
@@ -38,7 +38,7 @@
          <children>
             <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/avatar4.png" />
+                  <Image url="@../../images/avatars/avatar4.png" />
                </image>
             </ImageView>
             <Label text="Gethin Peters" />
@@ -55,7 +55,7 @@
          <children>
             <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/avatar5.png" />
+                  <Image url="@../../images/avatars/avatar5.png" />
                </image>
             </ImageView>
             <Label text="Gerard Gallagher" />
@@ -72,7 +72,7 @@
          <children>
             <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@resources/avatar6.png" />
+                  <Image url="@../../images/avatars/avatar6.png" />
                </image>
             </ImageView>
             <Label text="Betty Lopez" />
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/overview.fxml b/sampler/src/main/resources/atlantafx/sampler/fxml/overview.fxml
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/overview.fxml
rename to sampler/src/main/resources/atlantafx/sampler/fxml/overview.fxml
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/accept_blind-rage.png b/sampler/src/main/resources/atlantafx/sampler/images/album_covers/accept_blind-rage.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/accept_blind-rage.png
rename to sampler/src/main/resources/atlantafx/sampler/images/album_covers/accept_blind-rage.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/opeth_blackwater-park.png b/sampler/src/main/resources/atlantafx/sampler/images/album_covers/opeth_blackwater-park.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/opeth_blackwater-park.png
rename to sampler/src/main/resources/atlantafx/sampler/images/album_covers/opeth_blackwater-park.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/rainbow_rising.png b/sampler/src/main/resources/atlantafx/sampler/images/album_covers/rainbow_rising.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/rainbow_rising.png
rename to sampler/src/main/resources/atlantafx/sampler/images/album_covers/rainbow_rising.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/soen_lotus.png b/sampler/src/main/resources/atlantafx/sampler/images/album_covers/soen_lotus.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/soen_lotus.png
rename to sampler/src/main/resources/atlantafx/sampler/images/album_covers/soen_lotus.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar1.png b/sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar1.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar1.png
rename to sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar1.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar2.png b/sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar2.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar2.png
rename to sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar2.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar3.png b/sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar3.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar3.png
rename to sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar3.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar4.png b/sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar4.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar4.png
rename to sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar4.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar5.png b/sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar5.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar5.png
rename to sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar5.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar6.png b/sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar6.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/resources/avatar6.png
rename to sampler/src/main/resources/atlantafx/sampler/images/avatars/avatar6.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/20_min_adventure.jpg b/sampler/src/main/resources/atlantafx/sampler/images/fun/20_min_adventure.jpg
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/20_min_adventure.jpg
rename to sampler/src/main/resources/atlantafx/sampler/images/fun/20_min_adventure.jpg
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/saitama-bg.png b/sampler/src/main/resources/atlantafx/sampler/images/fun/saitama-bg.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/saitama-bg.png
rename to sampler/src/main/resources/atlantafx/sampler/images/fun/saitama-bg.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/saitama.png b/sampler/src/main/resources/atlantafx/sampler/images/fun/saitama.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/saitama.png
rename to sampler/src/main/resources/atlantafx/sampler/images/fun/saitama.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/color-palette.png b/sampler/src/main/resources/atlantafx/sampler/images/scene-builder/color-palette.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/color-palette.png
rename to sampler/src/main/resources/atlantafx/sampler/images/scene-builder/color-palette.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/scene-builder-in-action.jpg b/sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder-in-action.jpg
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/scene-builder-in-action.jpg
rename to sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder-in-action.jpg
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/scene-builder-themes.png b/sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder-themes.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/scene-builder-themes.png
rename to sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder-themes.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/scene-builder.png b/sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/scene-builder.png
rename to sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder.png
diff --git a/sampler/src/main/resources/atlantafx/sampler/images/scene-builder_32.png b/sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder_32.png
similarity index 100%
rename from sampler/src/main/resources/atlantafx/sampler/images/scene-builder_32.png
rename to sampler/src/main/resources/atlantafx/sampler/images/scene-builder/scene-builder_32.png