Resource Clean Up

res/Texts/CZ.lang

@@ -1,119 +0,0 @@
-# ToolBar (0-16)
-File
-New
-Open
-Save
-Edit
-Undo
-Redo
-Find/Replace
-Edit showed Information
-Options
-Reset Categories
-View
-View Size
-Help
-About Us
-Edit Edges
-Language
-# Tables (17-24)
-Object
-Nr.
-Device
-Energy
-Quantity
-Activated
-Field
-Information
-# Graph (25-26)
-None 
-Reset
-# Warning PopUps(27-30)
-Warning
-Do you want to save your current data?
-Do you really want to delete the Category 
-Please select a Category or an Object in order to delete something.
-#Edit Edges Pop Up (31-34)
-Edit Showed Informations
-Show Total Energy of Objects
-Show Connection Properties
-Cancel
-# Search/Replace Pop Up (35-45)
-Search for Objects
-Find
-Replace
-Direction
-Forward
-Backward
-Scope
-All
-Single
-Replace All
-Close
-# Edit Edges Pop Up (46-55)
-Edit Capacities of Edges
-Maximum Capacity:
-Change for all existing Edges only
-Change for new created Edges only
-Change for all existing and new created Edges
-Cancel
-Please select one of the options
-Please enter a number greater or equal 0 in the Field for Maximum Capacity
-Edit Edge Capacities
-(enter \"infinite\" for infinite Capacity)
-# Add PopUp Tree (56-63)
-Please enter a Name for Category 
-Please select a Category first before adding 
-Add Object Menu
-Name:
-Browse Image
-Add Element
-Delete Element
-Cancel
-# Add PopUp Element (64-71)
-Add Element to Object
-Element Name:
-Provided Energy:
-Amount:
-Please enter numbers in the Fields amount and providedEnergy
-No name
-Name already given
-Cancel
-# Info for PropertyTable (72-82)
-Name
-Total Energy
-Manual
-Active
- is connected to
- with ID: 
-Edge: 
- to 
-Current flow
-Max. Capacity
-Status
-# Info SimulationMenu (83-87)
-Simulate
-Simulation Speed:
-Algorithm:
-choose folder
-success
-# Exit Pop Up (88)
-Are you sure you want to exit?
-# Simulation ToolTip (89-93)
-Play
-Reset
-Forward
-Backward
-Time Slider"
-# Image Size Slider (94)
-Image Size
-# Menu - right click on HolonObjt (95-103)
-Cut
-Copy
-Paste
-Delete
-Group
-Ungroup
-Track
-Untrack
-Categories

res/Texts/DE.lang

@@ -1,119 +0,0 @@
-# ToolBar (0-16)
-Datei
-Neu
-Öffnen
-Speichern
-Bearbeiten
-Rückgängig
-Wiederherstellen
-Suchen/Ersetzen
-Gezeigte Informationen Ersetzen
-Optionen
-Kategorien Zurücksetzen
-Ansicht
-Ansichtsgröße
-Hilfe
-Über Uns
-Kanten Bearbeiten
-Sprache
-# Tables (17-24)
-Objekt
-Nr.
-Geräte
-Energie
-Quantität
-Aktiviert
-Feld
-Information
-#Graph (25-26)
-Nichts 
-Zurücksetzen
-#Warning PopUps(27-30)
-Warnung
-Möchten Sie ihre aktuellen Daten speichern?
-Möchten Sie wirklich die Kategorie löschen 
-Bitte wählen Sie eine Kategorie oder ein Objekt um etwas löschen zu können.
-#Edit Edges Pop Up (31-34)
-Gezeigte Informationen Ersetzen
-Gesamtenergie von Objekten zeigen
-Verbindungseigenschaften zeigen
-Abbrechen
-# Search/Replace Pop Up (35-45)
-Objekte suchen
-Suchen
-Ersetzen
-Richtung
-Vorwärts
-Rückwerts
-Scope
-Alle
-Einzeln
-Alle Ersetzen
-Schließen
-# Edit Edges Pop Up (46-55)
-Kapazitäten von Kanten bearbeiten
-Max. Kapazität:
-Nur für alle existierenden Kanten ändern
-Nur für neu erstellte Kanten ändern
-Für alle existierenden und neuen Kanten ändern
-Abbrechen
-Bitte wählen Sie eine der Optionen
-Bitte geben Sie eine Zahl größer-gleich 0 im Feld für Maximale Kapazität ein
-Kapazitäten von Kanten bearbeiten
-(geben Sie \"infinite\" für unbeschränkte Kapazitäten ein)
-# Add PopUp Tree (56-63)
-Bitte geben Sie einen Namen für die Kategorie ein 
-Bitte wählen Sie eine Kategorie vor dem hinzufügen 
-Objekt Hinzufügen Menü
-Name:
-Bilder durchsuchen
-Element hinzufügen
-Element löschen
-Abbrechen
-#Add PopUp Element (64-71)
-Element zu Objekt hinzufügen
-Element Name:
-Bereitgestellte Energie:
-Menge:
-Bitte geben Sie Nummern in den Feldern für Menge und Energie ein
-Kein Name
-Name bereits vergeben
-Abbrechen
-# Info for PropertyTable (72-82)
-Name
-Gesamte Energie
-Manuell
-Aktive
- ist verbunden mit
- mit ID: 
- Kante: 
- nach 
-aktueller Fluss
-Max. Kapazität
-Status
-# Info SimulationMenu (83-87)
-Simulieren
-Simulationsgeschwindigkeit:
-Algorithmus:
-nichts ausgewählt
-Erfolg
-# Exit Pop Up (88)
-Sind Sie sich sicher, dass Sie das Programm beenden wollen?
-# Simulation ToolTip (89-93)
-Abspielen
-Zurücksetzen
-Vorwärts
-Rückwärts
-Zeitschieber
-# Image Size Slider (94)
-Bildgröße
-#Menu - right click on HolonObjt (95-102)
-Ausschneiden
-Kopieren
-Einfügen
-Löschen
-Gruppieren
-Degruppieren
-Verfolgen
-NichtVerfolgen
-Kategorien

res/Texts/ES.lang

@@ -1,120 +0,0 @@
-#ToolBar (0-16)
-Archivo
-Nuevo
-Abrir
-Guardar
-Editar
-Deshacer
-Rehacer
-Buscar/Reemplazar
-Editar Información a mostrar
-Opciones
-Resetear Categorias
-Vista
-Tamaño de Vista
-Ayuda
-Sobre Nosotros
-Editar Conexiones
-Idiomas
-#Tables (17-24)
-Objeto
-Nr.
-Equipo
-Enegia
-Cantidad
-Activo
-Campo
-Información
-#Graph (25-26)
-Vacio 
-Resetear
-#Warning PopUps(27-30)
-Atención
-Desea guardar su progreso?"
-Esta seguro que quiere eliminar la categoría 
-Por favor, seleccione una categoria o un objecto para poder proceder a eliminarlo.
-#Edit Edges Pop Up (31-34)
-Editar información a mostrar
-Mostrar energia total de los objetos
-Mostrar propiedades de las conexiones
-Cancelar
-#Search/Replace Pop Up (35-45)
-Buscar Objetos
-Buscar
-Reemplazar
-Dirección
-Adelante
-Atrás
-Alcance
-Todo
-Uno
-Reemplazar Todo
-Cerrar
-#Edit Edges Pop Up (46-55)
-Editar Capacidad de las Conexiones
-Capacidad Max.:
-Cambiar para todas las conexiones existentes
-Cambiar solo para conexiones nuevas
-Cambiar para todas las conexiones existentes y nuevas
-Cancelar
-Por favor, elija una de las opciones
-Por favor, ingrese un valor mayor o igual a 0 en el campo de Capacidad Max.
-Editar capacidad de las conexiones
-(ingresar \"infinite\" para capacidad infinita)
-#Add PopUp Tree (56-63)
-Por favor, ingrese el nombre de la categoria 
-Por favor, elija una categoria antes de agregar 
-Menu para Agregar un Objeto
-Nombre:
-Buscar Imagen
-Agregar Elemento
-Eliminar Elemento
-Cancelar
-#Add PopUp Element (64-71)
-Agregar Elemento al Objecto
-Nombre del El.:
-Energía:
-Cantidad:
-Por favor, ingrese valores en los campos de cantidad y energía
-Sin nombre
-Nombre en uso
-Cancelar
-#Info for PropertyTable (72-82)
-Nombre
-Energia Total
-Manual
-Activo
-esta conectado a 
- con ID: 
-Canto: 
- a 
-Corriente actual
-Capacidad Max.
-Estado
-#Info SimulationMenu (83-87)
-Simular
-Velocidad de Simulación:
-Algoritmo:
-nada seleccionado
-exito
-#Exit Pop Up (88)
-Esta seguro que quiere cerrar el programa?
-#Simulation ToolTip (89-93)
-Iniciar
-Resetear
-Adelante
-Atrás
-Linea de Tiempo
-#Image Size Slider (94)
-Tamaño de la Imagen
-#Menu - right click on HolonObjt (95-103)
-Cortar
-Copiar
-Pegar
-Eliminar
-Agrupar
-Desagrupar
-Rastrear
-Dejar de rastrear
-#missing categories???
-Categories 

res/Texts/ZH.lang

@@ -1,119 +0,0 @@
-# ToolBar (0-16)
-文档
-新
-打开
-保存
-编辑
-撤销
-重做
-查找/替换
-编辑显示的信息
-选项
-复位类别
-视图
-视图尺寸
-帮助
-关于我们
-编辑边缘
-语言
-# Tables (17-24)
-对象
-No.
-能源
-电能
-数量
-激活
-字段
-信息
-# Graph (25-26)
-无
-重置
-# Warning PopUps(27-30)
-警告
-需要储存现在的数据吗？
-真的想删除类别吗?
-请选择一个类别或对象以便删除。
-#Edit Edges Pop Up (31-34)
-编辑显示的信息
-显示这个对象的总能源
-显示这个对象的总能源
-取消
-# Search/Replace Pop Up (35-45)
-搜索对象
-寻找
-重置
-方向
-前进
-后退
-范围
-全选
-单一
-重置全部
-关闭
-# Edit Edges Pop Up (46-55)
-编辑边缘容量
-最大容量:
-更改现有全部编辑
-更改更新内容部分编辑
-更改现有全部以及更新内容部分编辑
-取消
-请选择一个选项
-请输入一个数字大于或等于在字段为最大容量
-编辑边缘容量
-(进入 \"无限\" 无限产能)
-# Add PopUp Tree (56-63)
-请输入类别名称 
-请在添加之前选定一个类别 
-添加对象菜单
-名称:
-浏览图片
-添加元素
-删除元素
-取消
-# Add PopUp Element (64-71)
-添加元素至对象
-元素名称:
-提供能源:
-数量:
-请在字段中输入数量以及假设能源数字
-无名
-已给出的名称
-取消
-# Info for PropertyTable (72-82)
-名称
-总能量
-手册
-主动
- 链接至
- 通过ID: 
-边缘: 
- 至 
-电流流
-最大容量
-状态
-# Info SimulationMenu (83-87)
-模拟
-仿真速度:
-计算程序:
-选择“文件夹
-成功
-# Exit Pop Up (88)
-您确定想要退出?
-# Simulation ToolTip (89-93)
-播放
-复位
-前进
-后退
-时间滑块
-# Image Size Slider (94)
-图片尺寸
-# Menu - right click on HolonObjt (95-103)
-Cut
-Copy
-Paste
-Delete
-Group
-Ungroup
-Track
-Untrack
-Categories

src/holeg/addon/Randomizer.java

@@ -115,7 +115,7 @@ public class Randomizer implements AddOn {
 		headPanel.setLayout(new BoxLayout(headPanel, BoxLayout.LINE_AXIS));
 		headPanel.add(new JLabel("FILTER"));
 		JButton updateButton = new JButton();
-		updateButton.setIcon(new ImageIcon(ImageImport.loadImage("Images/replace.png", 15, 15)));
+		updateButton.setIcon(new ImageIcon(ImageImport.loadImage("images/canvas/replace.png", 15, 15)));
 		updateButton.addActionListener(action -> {
 			this.updateFilterList();
 			content.updateUI();

src/holeg/addon/helper/EmailNotification.java

@@ -48,7 +48,7 @@ public class EmailNotification {
 		loadPreferences();
 		JFrame frame = new JFrame();
 		frame.setTitle("Email Settings");
-		frame.setIconImage(ImageImport.loadImage("/Images/Holeg.png",30,30));
+		frame.setIconImage(ImageImport.loadImage("/images/logo/holeg.png",30,30));
 		frame.setContentPane(createEditFormular(frame));
 		frame.pack();
 		frame.setPreferredSize(new Dimension(400,frame.getHeight()));

src/holeg/api/AlgorithmFrameworkFlex.java

@@ -215,7 +215,7 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
 		emailNotificationCheckbox.addActionListener(actionEvent -> useEmailNotification = emailNotificationCheckbox.isSelected());
 		parameterPanel.add(emailNotificationCheckbox);
 		
-		JButton emailSettingsButton = new JButton("", new ImageIcon(ImageImport.loadImage("/Images/settingsIcon.png", 16,16)));
+		JButton emailSettingsButton = new JButton("", new ImageIcon(ImageImport.loadImage("/images/buttons/settings.png", 16,16)));
 		emailSettingsButton.setBounds(1030, 200, 20, 20);
 		emailSettingsButton.addActionListener(event -> {
 			EmailNotification.OpenEmailSettings(content);

src/holeg/api/TopologieAlgorithmFramework.java

@@ -1169,7 +1169,7 @@ public abstract class TopologieAlgorithmFramework implements AddOn{
 		public void resetState() {
 			state = 0;
 			wildcard.setName("Wildcard");
-			wildcard.setImage("/Images/home-2.png");
+			wildcard.setImage("/images/canvas/home.png");
 			wildcard.getElements().clear();
 		}
 		

src/holeg/model/AbstractCanvasObject.java

@@ -30,6 +30,7 @@ public abstract class AbstractCanvasObject {
 	/* Position with a X and Y value */
 	@Expose
 	Vector2Int position = new Vector2Int(0,0);
+	//TODO(Tom2022-01-11): Saving should be removed
 	@Expose
 	String sav;
 	

src/holeg/model/GroupNode.java

@@ -15,7 +15,7 @@ public class GroupNode extends AbstractCanvasObject {
 
 	public GroupNode(String nodeName) {
 		super(nodeName);
-		this.setImage("/Images/upper_node.png");
+		this.setImage("/images/canvas/group_node.png");
 		this.setSav("CVS");
 	}
 

src/holeg/model/HolonSwitch.java

@@ -120,11 +120,11 @@ public class HolonSwitch extends AbstractCanvasObject implements TimelineDepende
 	}
 
 	public static String getSwitchClosedImage() {
-		return "/Images/switch-on.png";
+		return "/images/canvas/switch_on.png";
 	}
 
 	public static String getSwitchOpenImage() {
-		return "/Images/switch-off.png";
+		return "/images/canvas/switch-off.png";
 	}
 
 	//TODO(Tom2021-12-20): remove getState timestep
@@ -168,15 +168,15 @@ public class HolonSwitch extends AbstractCanvasObject implements TimelineDepende
 	private void setImage() {
 		if (manualMode) {
 			if (!this.manualActive) {
-				setImage("/Images/switch-off.png");
+				setImage("/images/canvas/switch-off.png");
 			} else {
-				setImage("/Images/switch-on.png");
+				setImage("/images/canvas/switch-on.png");
 			}
 		} else {
 			if (!this.autoActive) {
-				setImage("/Images/switch-off.png");
+				setImage("/images/canvas/switch-off.png");
 			} else {
-				setImage("/Images/switch-on.png");
+				setImage("/images/canvas/switch-on.png");
 			}
 		}
 	}

src/holeg/model/Node.java

@@ -17,7 +17,7 @@ public class Node extends AbstractCanvasObject {
 	 */
 	public Node(String objName) {
 		super(objName);
-		this.setImage("/Images/node.png");
+		this.setImage("/images/canvas/node.png");
 		this.setSav("CVS");
 	}
 	

src/holeg/ui/controller/CategoryController.java

@@ -43,9 +43,9 @@ public class CategoryController {
 		Category building = createCategoryWithName("Building");
 		Category component = createCategoryWithName("Component");
 		HolonObject powerPlant = addNewHolonObject(energy, "Power Plant", new ArrayList<HolonElement>(),
-				"/Images/power-plant.png");
-		HolonObject house = addNewHolonObject(building, "House", new ArrayList<HolonElement>(), "/Images/home-2.png");
-		addNewHolonSwitch(component, "Switch", "/Images/switch-on.png");
+				"/images/canvas/power_plant.png");
+		HolonObject house = addNewHolonObject(building, "House", new ArrayList<HolonElement>(), "/images/canvas/home.png");
+		addNewHolonSwitch(component, "Switch", "/images/canvas/switch_on.png");
 		powerPlant.addElement(new HolonElement(null, "Power", 10000));
 		energy.getObjects().add(powerPlant);
 	

src/holeg/ui/controller/Control.java

@@ -191,7 +191,7 @@ public class Control {
 	 * @throws IOException
 	 */
 	public void addSwitch(Category cat, String obj) {
-		categoryController.addNewHolonSwitch(cat, obj, "/Images/switch-on.png");
+		categoryController.addNewHolonSwitch(cat, obj, "/images/canvas/switch_on.png");
 		saveCategory();
 	}
 

src/holeg/ui/view/canvas/Canvas.java

@@ -44,7 +44,6 @@ import holeg.ui.model.DecoratedSwitch;
 import holeg.ui.model.DecoratedSwitch.SwitchState;
 import holeg.ui.model.ExitCable;
 import holeg.ui.model.GuiSettings;
-import holeg.ui.model.Model;
 import holeg.ui.model.Passiv;
 import holeg.ui.model.Supplier;
 import holeg.ui.model.VisualRepresentationalState;
@@ -370,7 +369,7 @@ public class Canvas extends AbstractCanvas implements MouseListener, MouseMotion
 		g.setColor(Color.lightGray);
 		g.fillRect(pos.getX() - GuiSettings.getPictureScaleDiv2(), pos.getY() - GuiSettings.getPictureScaleDiv2(),
 				GuiSettings.getPictureScale(), GuiSettings.getPictureScale());
-		drawCanvasObject(g, "/Images/upper_node.png", pos);
+		drawCanvasObject(g, "/images/canvas/group_node.png", pos);
 		paintGroupNodeBar(g, dGroupNode, pos);
 	}
 
@@ -513,7 +512,7 @@ public class Canvas extends AbstractCanvas implements MouseListener, MouseMotion
 			paintSwitch(g2d, dSwitch);
 		}
 		for (Node node : visualState.getNodeList()) {
-			drawCanvasObject(g2d, "/Images/node.png", node.getPosition());
+			drawCanvasObject(g2d, "/images/canvas/node.png", node.getPosition());
 		}
 
 		// -->oldCode
@@ -555,7 +554,7 @@ public class Canvas extends AbstractCanvas implements MouseListener, MouseMotion
 		if (mayBeReplaced != null) {
 			g2d.setColor(Color.RED);
 			Vector2Int pos = mayBeReplaced.getPosition();
-			g2d.drawImage(ImageImport.loadImage("/Images/replace.png"), pos.getX() + GuiSettings.getPictureScaleDiv2(),
+			g2d.drawImage(ImageImport.loadImage("/images/canvas/replace.png"), pos.getX() + GuiSettings.getPictureScaleDiv2(),
 					pos.getY() - GuiSettings.getPictureScale(), GuiSettings.getPictureScaleDiv2(), GuiSettings.getPictureScaleDiv2(), null);
 		}
 		// <-- OldCode

src/holeg/ui/view/component/Console.java

@@ -31,16 +31,16 @@ public class Console extends JPanel {
 		this.add(scrollPane, BorderLayout.CENTER);
 		JToolBar toolBar = new JToolBar();
 		toolBar.setFloatable(false);
-		JButton clearButton  = new JButton("", new ImageIcon(ImageImport.loadImage("/Button_Images/Clear.png", 24, 24)));
+		JButton clearButton  = new JButton("", new ImageIcon(ImageImport.loadImage("/images/buttons/clear.png", 24, 24)));
 		clearButton.setToolTipText("Clear Console");
 		clearButton.addActionListener(actionEvent -> clear());
 		toolBar.add(clearButton);
 		toolBar.add(Box.createHorizontalGlue());
-		JButton topButton = new JButton("", new ImageIcon(ImageImport.loadImage("/Button_Images/Top.png", 24, 24)));
+		JButton topButton = new JButton("", new ImageIcon(ImageImport.loadImage("/images/buttons/top.png", 24, 24)));
 		topButton.setToolTipText("Scroll to top");
 		topButton.addActionListener(actionEvent -> scrollToTop());
 		toolBar.add(topButton);
-		JButton botButton = new JButton("", new ImageIcon(ImageImport.loadImage("/Button_Images/Bottom.png", 24, 24)));
+		JButton botButton = new JButton("", new ImageIcon(ImageImport.loadImage("/images/buttons/bottom.png", 24, 24)));
 		botButton.setToolTipText("Scroll to bottom");
 		botButton.addActionListener(actionEvent -> scrollToBottom());
 		toolBar.add(botButton);

src/holeg/ui/view/dialog/AboutUsPopUp.java

@@ -56,7 +56,7 @@ public class AboutUsPopUp extends JFrame {
         contentPanel2.setLayout(new BoxLayout(contentPanel2, BoxLayout.Y_AXIS));
         contentPanel3.setLayout(new BoxLayout(contentPanel3, BoxLayout.Y_AXIS));
         
-        this.setIconImage(ImageImport.loadImage("/Images/Holeg.png",30,30));
+        this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png",30,30));
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         setBounds(100, 100, 500, 800);
         setLocationRelativeTo(parentFrame);

src/holeg/ui/view/dialog/AddElementPopUp.java

@@ -55,7 +55,7 @@ public class AddElementPopUp extends JDialog {
 	 */
 	AddElementPopUp(JFrame parentFrame) {
 		super((java.awt.Frame) null, true);
-		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);
 		setBounds(100, 100, 400, 245);
 		setLocationRelativeTo(parentFrame);

src/holeg/ui/view/dialog/AddObjectPopUp.java

@@ -74,7 +74,7 @@ public class AddObjectPopUp extends JDialog {
 
 		toEdit = obj;
 		editState = edit;
-		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 		setBounds(100, 100, 450, 342);
 		setLocationRelativeTo(parentFrame);
 		getContentPane().setLayout(new BorderLayout());

src/holeg/ui/view/dialog/CanvasResizePopUp.java

@@ -35,7 +35,7 @@ public class CanvasResizePopUp extends JDialog {
 		this.canvas = canvas;
 
 		// properties and stuff
-		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png",30,30));
+		this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png",30,30));
 		this.setTitle("Set the Size of the View");
 		setBounds(200, 100, 200, 100);
         setLocationRelativeTo(parentFrame);

src/holeg/ui/view/dialog/CreateTemplatePopUp.java

@@ -112,7 +112,7 @@ public class CreateTemplatePopUp extends JDialog {
 		/*
 		 * create Frame and GUI
 		 */
-		setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 		setBounds(100, 100, 476, 344);
 		setLocationRelativeTo(parentFrame);
 		getContentPane().setLayout(new BorderLayout());

src/holeg/ui/view/inspector/Inspector.java

@@ -45,11 +45,11 @@ public class Inspector extends JSplitPane {
 	private final JToolBar toolBarGraph = new JToolBar();
 	private String[] comboContext = { "", "5", "10", "20", "100", "1000" };
 	private JComboBox<String> localPeriodInput = new JComboBox<String>(comboContext);
-	private JButton resetButton = new JButton("", new ImageIcon(ImageImport.loadImage("/Images/resetIcon3.png")));
-	private final ImageIcon localPeriodButtonImageEnabled = new ImageIcon(ImageImport.loadImage("/Images/Graph.png"));
+	private JButton resetButton = new JButton("", new ImageIcon(ImageImport.loadImage("/images/buttons/reset_circle.png")));
+	private final ImageIcon localPeriodButtonImageEnabled = new ImageIcon(ImageImport.loadImage("/images/buttons/graph.png"));
 
 	private final ImageIcon localPeriodButtonImageDisabled = new ImageIcon(
-			GrayFilter.createDisabledImage(ImageImport.loadImage("/Images/Graph.png")));
+			GrayFilter.createDisabledImage(ImageImport.loadImage("/images/buttons/graph.png")));
 	private JButton localPeriodButton = new JButton("", localPeriodButtonImageEnabled);
 
 	public Inspector(Control control) {

src/holeg/ui/view/inspector/InspectorTable.java

@@ -232,7 +232,7 @@ public class InspectorTable extends JPanel {
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
 		buttonPanel.add(Box.createRigidArea(new Dimension(2, 0)));
 
-		addButton.setIcon(new ImageIcon(ImageImport.loadImage("Images/plus.png", 16, 16)));
+		addButton.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/plus.png", 16, 16)));
 		addButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		addButton.addActionListener(clicked -> {
 			Optional<HolonObject> last = GuiSettings.getSelectedObjects().stream()
@@ -246,7 +246,7 @@ public class InspectorTable extends JPanel {
 		});
 		buttonPanel.add(addButton);
 
-		duplicateButton.setIcon(new ImageIcon(ImageImport.loadImage("Images/duplicate.png", 16, 16)));
+		duplicateButton.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/duplicate.png", 16, 16)));
 		duplicateButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		duplicateButton.addActionListener(clicked -> {
 			rowPool.getBorrowedStream().forEach(row -> {
@@ -259,7 +259,7 @@ public class InspectorTable extends JPanel {
 		});
 		buttonPanel.add(duplicateButton);
 
-		deleteButton.setIcon(new ImageIcon(ImageImport.loadImage("Images/minus.png", 16, 16)));
+		deleteButton.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/minus.png", 16, 16)));
 		deleteButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		deleteButton.addActionListener(clicked -> {
 			rowPool.getBorrowedStream().forEach(row -> {
@@ -272,12 +272,12 @@ public class InspectorTable extends JPanel {
 		});
 		buttonPanel.add(deleteButton);
 
-		pageIncreaseButton.setIcon(new ImageIcon(ImageImport.loadImage("Images/page_increase.png", 16, 16)));
+		pageIncreaseButton.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/page_increase.png", 16, 16)));
 		;
 		pageIncreaseButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		pageIncreaseButton.addActionListener(clicked -> this.performPageAction(PageAction.Increase));
 
-		pageDecreaseButton.setIcon(new ImageIcon(ImageImport.loadImage("Images/page_decrease.png", 16, 16)));
+		pageDecreaseButton.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/page_decrease.png", 16, 16)));
 		pageDecreaseButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		pageDecreaseButton.addActionListener(clicked -> this.performPageAction(PageAction.Decrease));
 

src/holeg/ui/view/main/GUI.java

@@ -509,7 +509,7 @@ public class GUI {
 
 		holegJFrame.setJMenuBar(menuBar);
 
-		holegJFrame.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		holegJFrame.setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 
 		menuBar.add(mnNewMenu);
 
@@ -717,7 +717,7 @@ public class GUI {
 				if (label.getText().isEmpty()) {
 					label.setText(value.toString());
 					if (!value.toString().equals("Categories")) {
-						label.setIcon(new ImageIcon(ImageImport.loadImage("/Images/folder.png")));
+						label.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/folder.png")));
 					}
 				}
 
@@ -975,7 +975,7 @@ public class GUI {
 			new CreateNewDialog(control, Option.Switch, holegJFrame);
 		});
 		btnAdd.addActionListener(actionEvent -> btnAddPopUp.show(btnAdd, -1, +20));
-		btnAdd.setIcon(new ImageIcon(ImageImport.loadImage("Images/plus.png", 16, 16)));
+		btnAdd.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/plus.png", 16, 16)));
 		btnAdd.setToolTipText("<html><b>New</b><br>Add a new Category or Item to the library.</html>");
 		toolBar.add(btnAdd);
 		/**
@@ -1067,7 +1067,7 @@ public class GUI {
 			}
 			categoryTree.repaint();
 		});
-		btnDel.setIcon(new ImageIcon(ImageImport.loadImage("Images/minus.png", 16, 16)));
+		btnDel.setIcon(new ImageIcon(ImageImport.loadImage("images/buttons/minus.png", 16, 16)));
 		btnDel.setToolTipText("<html><b>Delete</b><br>Removes a Category or a Category Item.</html>");
 		toolBar.add(btnDel);
 
@@ -1306,7 +1306,7 @@ public class GUI {
 		menuBar.add(menuWindow);
 		// Algo
 		JMenuItem openMenu = new JMenuItem("Open Algorithm Panel", new ImageIcon(ImageImport
-				.loadImage("/Button_Images/iconAlgo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
+				.loadImage("/images/buttons/algo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
 		openMenu.addActionListener(actionEvent -> {
 			new AddOnWindow(holegJFrame, control);
 		});
@@ -1314,7 +1314,7 @@ public class GUI {
 		menuWindow.add(openMenu);
 		// Outliner
 		JMenuItem openOutliner = new JMenuItem("Open Outliner", new ImageIcon(ImageImport
-				.loadImage("/Button_Images/iconOutliner.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
+				.loadImage("/images/buttons/outliner.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
 		openOutliner.addActionListener(actionEvent -> {
 			new Outliner(holegJFrame, model, control);
 		});
@@ -1323,7 +1323,7 @@ public class GUI {
 		menuWindow.add(openOutliner);
 		// FlexWindow
 		JMenuItem openFlexMenuItem = new JMenuItem("Open Flexibility Panel", new ImageIcon(ImageImport
-				.loadImage("/Button_Images/iconAlgo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
+				.loadImage("/images/buttons/algo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
 		openFlexMenuItem.addActionListener(actionEvent -> {
 			new FlexWindow(holegJFrame, control);
 		});

src/holeg/ui/view/main/TimePanel.java

@@ -159,13 +159,13 @@ public class TimePanel extends JPanel implements ActionListener {
 		playBtn.setContentAreaFilled(false);
 		playBtn.setBorderPainted(false);
 		playBtn.setBorder(null);
-		playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/play.png", 30, 30)));
+		playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/play.png", 30, 30)));
 		playBtn.addActionListener(clicked -> play());
 		timeResetBtn.setToolTipText("Reset");
 
 		timeResetBtn.setContentAreaFilled(false);
 		timeResetBtn.setBorder(null);
-		timeResetBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/reset.png", 30, 30)));
+		timeResetBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/reset.png", 30, 30)));
 		timeResetBtn.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {
 				timeSlider.setValue(timeSlider.getMinimum());
@@ -181,7 +181,7 @@ public class TimePanel extends JPanel implements ActionListener {
 
 		timeForwardBtn.setContentAreaFilled(false);
 		timeForwardBtn.setBorder(null);
-		timeForwardBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/forward.png", 30, 30)));
+		timeForwardBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/forward.png", 30, 30)));
 		timeForwardBtn.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {
 				timeSlider.setValue(timeSlider.getValue() + 1);
@@ -191,7 +191,7 @@ public class TimePanel extends JPanel implements ActionListener {
 		timeBackwardBtn.setToolTipText("Backward");
 
 		timeBackwardBtn.setBorder(null);
-		timeBackwardBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/backward.png", 30, 30)));
+		timeBackwardBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/backward.png", 30, 30)));
 		timeBackwardBtn.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {
 				timeSlider.setValue(timeSlider.getValue() - 1);
@@ -327,7 +327,7 @@ public class TimePanel extends JPanel implements ActionListener {
 		timer.setDelay(GuiSettings.timerSpeed);
 		if (timeSlider.getValue() >= control.getModel().getMaxIterations() - 1) {
 			running = false;
-			playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/play.png", 30, 30)));
+			playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/play.png", 30, 30)));
 			timer.stop();
 		}
 	}
@@ -339,10 +339,10 @@ public class TimePanel extends JPanel implements ActionListener {
 		if (running) {
 			timer.setDelay(GuiSettings.timerSpeed);
 			timer.start();
-			playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/pause.png", 30, 30)));
+			playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/pause.png", 30, 30)));
 		} else {
 			timer.stop();
-			playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/Button_Images/play.png", 30, 30)));
+			playBtn.setIcon(new ImageIcon(ImageImport.loadImage("/images/buttons/play.png", 30, 30)));
 		}
 	}
 	

src/holeg/ui/view/window/AddOnWindow.java

@@ -38,7 +38,7 @@ public class AddOnWindow extends JFrame{
 		this.setTitle("Add-Ons");
 		this.setVisible(true);
 		this.setContentPane(content);
-		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 		initMenuBar();
 		initDefaultContentPanel();
 		this.pack();

src/holeg/ui/view/window/FlexWindow.java

@@ -110,7 +110,7 @@ public class FlexWindow extends JFrame {
 
 	private void initWindowPanel(JFrame parentFrame) {
 		this.setBounds(0, 0, 400, parentFrame.getHeight()>20?parentFrame.getHeight()- 20:parentFrame.getHeight());
-		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 		this.setTitle("Flexibility");
 		this.setLocationRelativeTo(parentFrame);
 		this.setVisible(true);

src/holeg/ui/view/window/Outliner.java

@@ -46,7 +46,7 @@ public class Outliner extends JFrame {
 	Runnable update = this::update;
 	public Outliner(JFrame parentFrame, Model model, Control control){ 
 		setBounds(0, 0, 400, parentFrame.getHeight());
-		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
+		this.setIconImage(ImageImport.loadImage("/images/logo/holeg.png", 30, 30));
 		this.setTitle("Outliner");
 		setLocationRelativeTo(parentFrame);
 		this.setVisible(true);
@@ -155,9 +155,9 @@ public class Outliner extends JFrame {
 
 
 	private void signIconsForTree(JTree t) {
-		ImageIcon ClosedIcon = new ImageIcon(ImageImport.loadImage("/Button_Images/Close.png",9,9));
-		ImageIcon OpenIcon = new ImageIcon(ImageImport.loadImage("/Button_Images/Open.png",9,9));
-		ImageIcon LeafIcon = new ImageIcon(ImageImport.loadImage("/Button_Images/Leaf.png",9,9));
+		ImageIcon ClosedIcon = new ImageIcon(ImageImport.loadImage("/images/buttons/close.png",9,9));
+		ImageIcon OpenIcon = new ImageIcon(ImageImport.loadImage("/images/buttons/open.png",9,9));
+		ImageIcon LeafIcon = new ImageIcon(ImageImport.loadImage("/images/buttons/leaf.png",9,9));
 		if (ClosedIcon != null && OpenIcon != null && LeafIcon!= null) {
 		    DefaultTreeCellRenderer renderer = 
 		        new DefaultTreeCellRenderer();

src/holeg/utility/ImageImport.java

@@ -111,7 +111,7 @@ public class ImageImport {
 			}
 			f = new File(url);// Possible bug with duplicate names.
 			if (!f.exists()) {
-				url = "res/Images/image_not_found.png";
+				url = "res/images/canvas/image_not_found.png";
 			}
 			return new FileInputStream(url);