Restructure Packages

src/Connection/ConnectHandheld.java

@@ -27,7 +27,7 @@ import classes.GroupNode;
 import classes.HolonObject;
 import Connection.socket.Server;
 import ui.controller.Control;
-import ui.view.Console;
+import ui.view.componnents.Console;
 
 public class ConnectHandheld implements AddOn{
 	

src/Connection/ConnectPhysical.java

@@ -36,7 +36,7 @@ import classes.GroupNode;
 import classes.HolonElement;
 import classes.HolonObject;
 import ui.controller.Control;
-import ui.view.Console;
+import ui.view.componnents.Console;
 /**
  * Easy Connection via Http Request. Repeat Request with a delay.
  * 

src/Connection/socket/Server.java

@@ -17,7 +17,7 @@ public class Server implements Runnable{
     private DataInputStream in;
     private boolean stopped = false;		
     private boolean connection = false;
-    private ui.view.Console console;
+    private ui.view.componnents.Console console;
     
     
     private HolonObject observed;
@@ -25,7 +25,7 @@ public class Server implements Runnable{
     private HolonObjectModel newModelField;
 	private Control control;
     
-    public Server(int port, ui.view.Console console, HolonObject observed, Control control) throws IOException {
+    public Server(int port, ui.view.componnents.Console console, HolonObject observed, Control control) throws IOException {
     	this.observed = observed;
     	this.console = console;
     	this.control = control;

src/addOns/InformationPanel.java

@@ -25,12 +25,12 @@ import api.AddOn;
 import classes.Flexibility;
 import classes.HolonElement;
 import classes.HolonElement.Priority;
+import model.DecoratedState;
+import model.VisualRepresentationalState;
+import model.DecoratedHolonObject.HolonObjectState;
+import model.DecoratedSwitch.SwitchState;
 import ui.controller.Control;
 import ui.controller.FlexManager.FlexState;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.DecoratedState;
-import ui.model.DecoratedSwitch.SwitchState;
-import ui.model.VisualRepresentationalState;
 
 public class InformationPanel implements AddOn {
 	Control control;

src/algorithm/binary/BaseLine.java

@@ -29,11 +29,11 @@ import classes.GroupNode;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
+import model.DecoratedGroupNode;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.Model;
 import ui.controller.Control;
-import ui.model.Model;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
 
 
 

src/algorithm/example/DemoAlgo.java

@@ -31,9 +31,9 @@ import classes.GroupNode;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
+import model.DecoratedGroupNode;
+import model.Model;
 import ui.controller.Control;
-import ui.model.DecoratedGroupNode;
-import ui.model.Model;
 
 public class DemoAlgo implements AddOn {
 

src/algorithm/example/FlexExample.java

@@ -32,17 +32,17 @@ import classes.AbstractCanvasObject;
 import classes.GroupNode;
 import classes.HolonElement;
 import classes.HolonElement.Priority;
+import model.DecoratedGroupNode;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.Model;
+import model.DecoratedHolonObject.HolonObjectState;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import ui.controller.Control;
 import ui.controller.FlexManager;
 import ui.controller.FlexManager.FlexState;
 import ui.controller.FlexManager.FlexWrapper;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
-import ui.model.Model;
-import ui.model.DecoratedHolonObject.HolonObjectState;
 
 public class FlexExample implements AddOn {
 		

src/algorithm/objectiveFunction/Evaluation.java

@@ -1,12 +1,12 @@
 package algorithm.objectiveFunction;
 
 import classes.HolonElement.Priority;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.DecoratedHolonObject.HolonObjectState;
 import classes.HolonObject;
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
 import ui.controller.FlexManager.FlexState;
 import ui.controller.FlexManager.FlexWrapper;
-import ui.model.DecoratedHolonObject.HolonObjectState;
 
 public class Evaluation {
 	

src/algorithm/objectiveFunction/GraphMetrics.java

@@ -11,11 +11,11 @@ import java.util.Set;
 
 import classes.AbstractCanvasObject;
 import classes.HolonSwitch;
-import ui.model.Consumer;
-import ui.model.DecoratedCable;
-import ui.model.DecoratedNetwork;
-import ui.model.Passiv;
-import ui.model.Supplier;
+import model.Consumer;
+import model.DecoratedCable;
+import model.DecoratedNetwork;
+import model.Passiv;
+import model.Supplier;
 
 public class GraphMetrics {
 	

src/algorithm/objectiveFunction/ObjectiveFunctionByCarlos.java

@@ -1,10 +1,9 @@
 package algorithm.objectiveFunction;
 
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
-
 import classes.Flexibility;
 import classes.HolonElement.Priority;
+import model.DecoratedNetwork;
+import model.DecoratedState;
 
 public class ObjectiveFunctionByCarlos {
 	//Parameters

src/algorithm/objectiveFunction/SwitchObjectiveFunction.java

@@ -1,7 +1,7 @@
 package algorithm.objectiveFunction;
 
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
+import model.DecoratedNetwork;
+import model.DecoratedState;
 public class SwitchObjectiveFunction {
 	
 	//weights

src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

@@ -1,13 +1,13 @@
 package algorithm.objectiveFunction;
 
 
-import ui.model.DecoratedHolonObject;
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
 import utility.FloatLog;
 
 import java.util.Locale;
 import algorithm.objectiveFunction.GraphMetrics.Graph;
+import model.DecoratedHolonObject;
+import model.DecoratedNetwork;
+import model.DecoratedState;
 
 public class TopologieObjectiveFunction {
 	//Parameters

src/algorithm/topologie/AcoAlgorithm.java

@@ -7,7 +7,7 @@ import java.util.ListIterator;
 
 import algorithm.objectiveFunction.TopologieObjectiveFunction;
 import api.TopologieAlgorithmFramework;
-import ui.model.DecoratedState;
+import model.DecoratedState;
 import utility.Random;
 
 public class AcoAlgorithm extends TopologieAlgorithmFramework {

src/algorithm/topologie/GaAlgorithm.java

@@ -8,7 +8,7 @@ import java.util.ListIterator;
 import java.util.TreeSet;
 import algorithm.objectiveFunction.TopologieObjectiveFunction;
 import api.TopologieAlgorithmFramework;
-import ui.model.DecoratedState;
+import model.DecoratedState;
 import utility.Random;
 
 public class GaAlgorithm extends TopologieAlgorithmFramework {

src/algorithm/topologie/PsoAlgorithm.java

@@ -8,7 +8,7 @@ import java.util.TreeSet;
 import java.util.stream.Collectors;
 import algorithm.objectiveFunction.TopologieObjectiveFunction;
 import api.TopologieAlgorithmFramework;
-import ui.model.DecoratedState;
+import model.DecoratedState;
 import utility.Random;
 
 public class PsoAlgorithm extends TopologieAlgorithmFramework {

src/api/AlgorithmFrameworkFlex.java

@@ -51,16 +51,16 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonElement.Priority;
+import model.DecoratedGroupNode;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.Model;
+import model.DecoratedHolonObject.HolonObjectState;
+import model.DecoratedSwitch.SwitchState;
 import ui.controller.Control;
 import ui.controller.FlexManager.FlexState;
 import ui.controller.FlexManager.FlexWrapper;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedState;
-import ui.model.Model;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.DecoratedSwitch.SwitchState;
-import ui.model.DecoratedNetwork;
-import ui.view.Console;
+import ui.view.componnents.Console;
 import utility.ImageImport;
 import utility.StringFormat;
 

src/api/TopologieAlgorithmFramework.java

@@ -48,14 +48,14 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.IdCounterElem;
 import classes.Node;
+import model.DecoratedGroupNode;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.Model;
+import model.DecoratedHolonObject.HolonObjectState;
+import model.DecoratedSwitch.SwitchState;
 import ui.controller.Control;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedState;
-import ui.model.Model;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.DecoratedSwitch.SwitchState;
-import ui.model.DecoratedNetwork;
-import ui.view.Console;
+import ui.view.componnents.Console;
 
 public abstract class TopologieAlgorithmFramework implements AddOn{
 	//Algo

src/classes/HolonElement.java

@@ -4,8 +4,8 @@ import com.google.gson.annotations.Expose;
 
 import interfaces.GraphEditable;
 import interfaces.LocalMode;
+import model.IndexTranslator;
 import ui.controller.FlexManager;
-import ui.view.IndexTranslator;
 
 import java.awt.*;
 import java.awt.geom.Point2D;

src/classes/HolonSwitch.java

@@ -9,7 +9,7 @@ import java.util.ListIterator;
 import com.google.gson.annotations.Expose;
 import interfaces.GraphEditable;
 import interfaces.LocalMode;
-import ui.view.IndexTranslator;
+import model.IndexTranslator;
 
 /**
  * The class HolonSwitch represents a Switch, which can be turned on and off.

src/ui/model/Consumer.java → src/model/Consumer.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 

src/ui/model/DecoratedCable.java → src/model/DecoratedCable.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import classes.Edge;
 

src/ui/model/DecoratedGroupNode.java → src/model/DecoratedGroupNode.java

@@ -1,10 +1,10 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 
 import classes.Node;
+import model.DecoratedHolonObject.HolonObjectState;
 import classes.GroupNode;
-import ui.model.DecoratedHolonObject.HolonObjectState;
 /**
  * For the @VisualRepresentationalState only.
  * @author Tom

src/ui/model/DecoratedHolonObject.java → src/model/DecoratedHolonObject.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import classes.HolonObject;
 

src/ui/model/DecoratedNetwork.java → src/model/DecoratedNetwork.java

@@ -1,14 +1,14 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import classes.HolonElement;
 import classes.HolonObject;
+import model.DecoratedCable.CableState;
+import model.DecoratedHolonObject.HolonObjectState;
+import model.Model.FairnessModel;
 import ui.controller.FlexManager;
-import ui.model.DecoratedCable.CableState;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.Model.FairnessModel;
 
 public class DecoratedNetwork {
 	private ArrayList<Supplier> supplierList = new ArrayList<Supplier>();

src/ui/model/DecoratedState.java → src/model/DecoratedState.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 

src/ui/model/DecoratedSwitch.java → src/model/DecoratedSwitch.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import classes.HolonSwitch;
 

src/ui/model/ExitCable.java → src/model/ExitCable.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import classes.AbstractCanvasObject;
 /**

src/ui/view/IndexTranslator.java → src/model/IndexTranslator.java

@@ -1,7 +1,6 @@
-package ui.view;
+package model;
 
 import interfaces.LocalMode;
-import ui.model.Model;
 
 
 public class IndexTranslator {

src/ui/model/IntermediateCableWithState.java → src/model/IntermediateCableWithState.java

@@ -1,9 +1,9 @@
-package ui.model;
+package model;
 
 import classes.Edge;
 import classes.HolonObject;
+import model.DecoratedCable.CableState;
 import ui.controller.FlexManager;
-import ui.model.DecoratedCable.CableState;
 
 /**
  * Intermediate to calculate/simulate the burning of Cables.

src/ui/model/IntermediateCalculationCable.java → src/model/IntermediateCalculationCable.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import classes.AbstractCanvasObject;
 import classes.Edge;

src/ui/model/MinimumModel.java → src/model/MinimumModel.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -6,10 +6,10 @@ import java.util.HashMap;
 import classes.AbstractCanvasObject;
 import classes.Edge;
 import classes.Node;
+import model.DecoratedCable.CableState;
 import classes.GroupNode;
 import classes.HolonObject;
 import classes.HolonSwitch;
-import ui.model.DecoratedCable.CableState;
 
 /**
  * For DecoratedState And VisualRepresentationalState

src/ui/model/MinimumNetwork.java → src/model/MinimumNetwork.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 

src/ui/model/Model.java → src/model/Model.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -28,8 +28,8 @@ import classes.Pair;
 import classes.Position;
 import interfaces.GraphListener;
 import interfaces.ObjectListener;
-import ui.view.DefaulTable;
-import ui.view.PropertyTable;
+import ui.view.main.DefaulTable;
+import ui.view.main.PropertyTable;
 
 /**
  * The Class Model is the class where everything is saved. All changes made to

src/ui/model/Passiv.java → src/model/Passiv.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import classes.HolonObject;
 

src/ui/model/Supplier.java → src/model/Supplier.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 

src/ui/model/VisualRepresentationalState.java → src/model/VisualRepresentationalState.java

@@ -1,4 +1,4 @@
-package ui.model;
+package model;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 import classes.AbstractCanvasObject;
 import classes.Edge;
 import classes.Node;
-import ui.model.ExitCable.ExitCableState;
+import model.ExitCable.ExitCableState;
 import classes.GroupNode;
 
 public class VisualRepresentationalState {

src/ui/controller/AutoSaveController.java

@@ -1,6 +1,6 @@
 package ui.controller;
 
-import ui.model.Model;
+import model.Model;
 
 /**
  * Autosave Controller.

src/ui/controller/CanvasController.java

@@ -13,7 +13,7 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.Position;
 import interfaces.ObjectListener;
-import ui.model.Model;
+import model.Model;
 
 /**
  * Controller for the Canvas.

src/ui/controller/CategoryController.java

@@ -8,7 +8,7 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.Pair;
-import ui.model.Model;
+import model.Model;
 
 /**
  * Controller for the Categories.

src/ui/controller/ClipboardController.java

@@ -1,12 +1,13 @@
 package ui.controller;
 
 import classes.*;
+import model.Model;
+
 import com.google.gson.*;
 import ui.controller.SaveController.EDGETYPE;
 import ui.controller.SaveController.GRAPHTYPE;
 import ui.controller.SaveController.NUMTYPE;
 import ui.controller.SaveController.TYPE;
-import ui.model.Model;
 
 import java.awt.*;
 import java.awt.datatransfer.*;

src/ui/controller/Control.java

@@ -19,10 +19,10 @@ import classes.GroupNode;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.Node;
-import ui.model.Model;
-import ui.model.Model.FairnessModel;
-import ui.view.CreateTemplatePopUp;
-import ui.view.GUI;
+import model.Model;
+import model.Model.FairnessModel;
+import ui.view.additional.popup.CreateTemplatePopUp;
+import ui.view.main.GUI;
 
 /**
  * The Class represents the controller in the model, controller view Pattern.

src/ui/controller/FlexManager.java

@@ -10,7 +10,7 @@ import classes.GroupNode;
 import classes.Flexibility;
 import classes.HolonElement;
 import classes.HolonObject;
-import ui.model.Model;
+import model.Model;
 
 /**
  * Class to Manage to flexibilities.

src/ui/controller/GlobalController.java

@@ -1,7 +1,7 @@
 package ui.controller;
 
-import ui.model.Model;
-import ui.model.Model.FairnessModel;
+import model.Model;
+import model.Model.FairnessModel;
 
 /**
  * Controller for the Global Variables.

src/ui/controller/HolonCanvasController.java

@@ -1,7 +1,7 @@
 package ui.controller;
 
 import classes.*;
-import ui.model.Model;
+import model.Model;
 
 import java.awt.*;
 import java.util.ArrayList;

src/ui/controller/LoadController.java

@@ -1,6 +1,7 @@
 package ui.controller;
 
 import classes.*;
+import model.Model;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -13,8 +14,6 @@ import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.utils.IOUtils;
 
-import ui.model.Model;
-
 import java.awt.geom.Point2D;
 import java.io.*;
 import java.nio.file.Files;

src/ui/controller/MultiPurposeController.java

@@ -9,7 +9,7 @@ import classes.GroupNode;
 import classes.AbstractCanvasObject;
 import classes.HolonElement;
 import classes.HolonObject;
-import ui.model.Model;
+import model.Model;
 
 /**
  * Controller for Multiple Purposes.

src/ui/controller/NodeController.java

@@ -5,7 +5,7 @@ import classes.Edge;
 import classes.Node;
 import classes.GroupNode;
 import classes.Position;
-import ui.model.Model;
+import model.Model;
 
 import java.awt.*;
 import java.util.ArrayList;

src/ui/controller/ObjectController.java

@@ -1,7 +1,7 @@
 package ui.controller;
 
 import classes.*;
-import ui.model.Model;
+import model.Model;
 
 import java.util.ArrayList;
 

src/ui/controller/SaveController.java

@@ -1,6 +1,8 @@
 package ui.controller;
 
 import classes.*;
+import model.Model;
+
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.reflect.TypeToken;
@@ -10,7 +12,7 @@ import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.utils.IOUtils;
-import ui.model.Model;
+
 import java.awt.geom.Point2D;
 import java.io.*;
 import java.util.*;

src/ui/controller/SimulationManager.java

@@ -1,18 +1,18 @@
 package ui.controller;
 
 import classes.*;
-import ui.model.IntermediateCableWithState;
-import ui.model.DecoratedCable;
-import ui.model.DecoratedCable.CableState;
-import ui.model.DecoratedSwitch.SwitchState;
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
-import ui.model.DecoratedSwitch;
-import ui.model.MinimumModel;
-import ui.model.MinimumNetwork;
-import ui.model.Model;
-import ui.model.Model.FairnessModel;
-import ui.model.VisualRepresentationalState;
+import model.DecoratedCable;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.DecoratedSwitch;
+import model.IntermediateCableWithState;
+import model.MinimumModel;
+import model.MinimumNetwork;
+import model.Model;
+import model.VisualRepresentationalState;
+import model.DecoratedCable.CableState;
+import model.DecoratedSwitch.SwitchState;
+import model.Model.FairnessModel;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/ui/controller/UpdateController.java

@@ -7,12 +7,12 @@ import classes.comparator.elementComparator.ElemCompOnId;
 import classes.comparator.elementComparator.ElemCompOnIsActivated;
 import classes.comparator.elementComparator.ElemCompOnObj;
 import classes.comparator.elementComparator.ElemCompOnQuantity;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.Model;
-import ui.view.DefaulTable;
-import ui.view.PropertyTable;
-import ui.view.GroupNodeCanvas;
+import model.DecoratedGroupNode;
+import model.Model;
+import model.DecoratedHolonObject.HolonObjectState;
+import ui.view.main.DefaulTable;
+import ui.view.main.GroupNodeCanvas;
+import ui.view.main.PropertyTable;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/ui/view/AddOnWindow.java → src/ui/view/additional/AddOnWindow.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -33,7 +33,7 @@ public class AddOnWindow extends JFrame{
 	private AddOn actual;
 	private Control control;
 	private JPanel content = new JPanel();
-	AddOnWindow(JFrame parentFrame, Control control){
+	public AddOnWindow(JFrame parentFrame, Control control){
 		this.control = control;
 		this.setTitle("Add-Ons");
 		this.setVisible(true);

src/ui/view/FlexWindow.java → src/ui/view/additional/FlexWindow.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -55,12 +55,12 @@ import classes.GroupNode;
 import classes.Flexibility;
 import classes.HolonElement;
 import classes.HolonElement.Priority;
+import model.Model;
 import classes.HolonObject;
 import ui.controller.Control;
 import ui.controller.FlexManager;
 import ui.controller.FlexManager.FlexState;
 import ui.controller.FlexManager.FlexWrapper;
-import ui.model.Model;
 import utility.ImageImport;
 
 

src/ui/view/Outliner.java → src/ui/view/additional/Outliner.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -16,17 +16,17 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
 import classes.AbstractCanvasObject;
+import model.Consumer;
+import model.DecoratedCable;
+import model.DecoratedNetwork;
+import model.DecoratedState;
+import model.DecoratedSwitch;
+import model.MinimumNetwork;
+import model.Model;
+import model.Passiv;
+import model.Supplier;
+import model.DecoratedHolonObject.HolonObjectState;
 import ui.controller.Control;
-import ui.model.Consumer;
-import ui.model.DecoratedCable;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.DecoratedNetwork;
-import ui.model.DecoratedState;
-import ui.model.DecoratedSwitch;
-import ui.model.MinimumNetwork;
-import ui.model.Model;
-import ui.model.Passiv;
-import ui.model.Supplier;
 import utility.ImageImport;
 
 
@@ -41,7 +41,7 @@ public class Outliner extends JFrame {
 	JPanel statePanel = new JPanel(new BorderLayout());
 	public boolean isClosed = false;
 	ArrayList<MinimumNetwork> list;
-	Outliner(JFrame parentFrame, Model model, Control controller){ 
+	public Outliner(JFrame parentFrame, Model model, Control controller){ 
 		setBounds(0, 0, 400, parentFrame.getHeight());
 		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
 		this.setTitle("Outliner");

src/ui/view/AboutUsPopUp.java → src/ui/view/additional/popup/AboutUsPopUp.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import javax.swing.*;
 

src/ui/view/AddElementPopUp.java → src/ui/view/additional/popup/AddElementPopUp.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import classes.AbstractCanvasObject;
 import classes.HolonElement;
@@ -50,7 +50,7 @@ public class AddElementPopUp extends JDialog {
 	 * Create the AddElementPopup Dialog
 	 * @param parentFrame
 	 */
-	AddElementPopUp(JFrame parentFrame) {
+	public AddElementPopUp(JFrame parentFrame) {
 		super((java.awt.Frame) null, true);
 		this.setIconImage(ImageImport.loadImage("/Images/Holeg.png", 30, 30));
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);
@@ -152,7 +152,7 @@ public class AddElementPopUp extends JDialog {
 	 * @param cps
 	 *            actual Cps
 	 */
-	void setActualCps(AbstractCanvasObject cps) {
+	public void setActualCps(AbstractCanvasObject cps) {
 		this.tempCps = cps;
 	}
 

src/ui/view/AddObjectPopUp.java → src/ui/view/additional/popup/AddObjectPopUp.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -74,7 +74,7 @@ public class AddObjectPopUp extends JDialog {
 	 * @param cat
 	 *            the categorie
 	 */
-    AddObjectPopUp(boolean edit, AbstractCanvasObject obj, String cat, JFrame parentFrame) {
+    public AddObjectPopUp(boolean edit, AbstractCanvasObject obj, String cat, JFrame parentFrame) {
 
         toEdit = obj;
 		editState = edit;

src/ui/view/BackgroundPopUp.java → src/ui/view/additional/popup/BackgroundPopUp.java

@@ -1,8 +1,9 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import classes.GroupNode;
+import model.Model;
 import ui.controller.Control;
-import ui.model.Model;
+import ui.view.main.MyCanvas;
 import utility.ImageImport;
 
 import javax.swing.*;

src/ui/view/CanvasResizePopUp.java → src/ui/view/additional/popup/CanvasResizePopUp.java

@@ -1,10 +1,14 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import ui.controller.Control;
-import ui.model.Model;
+import ui.view.main.GroupNodeCanvas;
+import ui.view.main.MyCanvas;
 import utility.ImageImport;
 
 import javax.swing.*;
+
+import model.Model;
+
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/ui/view/CreateNewDialog.java → src/ui/view/additional/popup/CreateNewDialog.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -45,7 +45,7 @@ public class CreateNewDialog extends JDialog{
 	
 	
 	
-	CreateNewDialog(Control controller, JFrame parentFrame){
+	public CreateNewDialog(Control controller, JFrame parentFrame){
 		super((JFrame)parentFrame, "Create a..");
 		actualController = controller;
 		setVisible(true);
@@ -79,7 +79,7 @@ public class CreateNewDialog extends JDialog{
 	}
 
 
-	CreateNewDialog(Control controller, Option aOption, JFrame parentFrame){
+	public CreateNewDialog(Control controller, Option aOption, JFrame parentFrame){
 		super((JFrame)parentFrame, "Create a " + aOption.name());
 		actualController = controller;
 		if(aOption == Option.None)

src/ui/view/CreateTemplatePopUp.java → src/ui/view/additional/popup/CreateTemplatePopUp.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import java.awt.BorderLayout;
 import java.awt.Choice;
@@ -23,8 +23,8 @@ import classes.Category;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.Pair;
+import model.Model;
 import ui.controller.Control;
-import ui.model.Model;
 import utility.ImageImport;
 
 /**

src/ui/view/EditEdgesPopUp.java → src/ui/view/additional/popup/EditEdgesPopUp.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import java.awt.BorderLayout;
 import java.awt.Font;
@@ -18,6 +18,7 @@ import javax.swing.border.EmptyBorder;
 
 import classes.Edge;
 import ui.controller.Control;
+import ui.view.main.MyCanvas;
 
 /**
  * Popup for Editing Edges.

src/ui/view/SearchPopUp.java → src/ui/view/additional/popup/SearchPopUp.java

@@ -1,7 +1,8 @@
-package ui.view;
+package ui.view.additional.popup;
 
 import classes.AbstractCanvasObject;
 import ui.controller.Control;
+import ui.view.main.MyCanvas;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -37,7 +38,7 @@ public class SearchPopUp extends JDialog {
 	 * @param can
 	 *            Canvas
 	 */
-    SearchPopUp(Control contr, MyCanvas can, JFrame parentFrame) {
+    public SearchPopUp(Control contr, MyCanvas can, JFrame parentFrame) {
         super((java.awt.Frame) null, true);
 		idx = -1;
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);

src/ui/view/ButtonTabComponent.java → src/ui/view/componnents/ButtonTabComponent.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.componnents;
 
 /*
  * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.

src/ui/view/Console.java → src/ui/view/componnents/Console.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.componnents;
 
 import java.awt.BorderLayout;
 

src/ui/view/AbstractCanvas.java → src/ui/view/main/AbstractCanvas.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -24,9 +24,9 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.Node;
 import classes.Position;
+import model.Model;
 import ui.controller.Control;
 import ui.controller.UpdateController;
-import ui.model.Model;
 
 /**
  * Collection of methods and values needed in both <code>MyCanvas</code> and
@@ -45,7 +45,7 @@ public abstract class AbstractCanvas extends JPanel {
 	
 	final JMenuItem itemCut = new JMenuItem("Cut");
 	final JMenuItem itemCopy = new JMenuItem("Copy");
-	final JMenuItem itemPaste = new JMenuItem("Paste");
+	public final JMenuItem itemPaste = new JMenuItem("Paste");
 	final JMenuItem itemDelete = new JMenuItem("Delete");
 	final JMenuItem itemGroup = new JMenuItem("Group");
 	final JMenuItem itemUngroup = new JMenuItem("Ungroup");
@@ -60,14 +60,14 @@ public abstract class AbstractCanvas extends JPanel {
 	protected int x = 0;
 	protected int y = 0;
 	// Selection
-	AbstractCanvasObject tempCps = null;
+	public AbstractCanvasObject tempCps = null;
 	UpdateController updCon;
 	
 	//Replacement
 	/**
 	 * the CpsObject that might be replaced by drag&drop
 	 */
-	protected AbstractCanvasObject mayBeReplaced = null;
+	public AbstractCanvasObject mayBeReplaced = null;
 	
 	// PopUpMenu
 	JPopupMenu popmenu = new JPopupMenu();
@@ -76,14 +76,14 @@ public abstract class AbstractCanvas extends JPanel {
 	Position toolTipPos = new Position(); // Tooltip Position
 	String toolTipText = "";
 	ArrayList<HolonElement> dataSelected = new ArrayList<>();
-	ArrayList<AbstractCanvasObject> tempSelected = new ArrayList<>();
+	public ArrayList<AbstractCanvasObject> tempSelected = new ArrayList<>();
 	boolean[] showedInformation = new boolean[5];
 	boolean showConnectionInformation;
 	boolean dragging = false; // for dragging
 	boolean dragged = false; // if an object/objects was/were dragged
 	boolean drawEdge = false; // for drawing edges
 	boolean doMark = false; // for double click
-	Edge edgeHighlight = null;
+	public Edge edgeHighlight = null;
 	Point mousePosition = new Point(); // Mouse Position when
 	ArrayList<Position> savePos;
 	// edge Object Start Point

src/ui/view/DefaulTable.java → src/ui/view/main/DefaulTable.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import javax.swing.table.DefaultTableModel;
 

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

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -86,12 +86,24 @@ import classes.HolonSwitch;
 import classes.IdCounter;
 import classes.IdCounterElem;
 import interfaces.GraphEditable;
+import model.DecoratedState;
+import model.Model;
+import model.Model.FairnessModel;
 import ui.controller.Control;
 import ui.controller.UpdateController;
-import ui.model.DecoratedState;
-import ui.model.Model;
-import ui.model.Model.FairnessModel;
-import ui.view.CreateNewDialog.Option;
+import ui.view.additional.AddOnWindow;
+import ui.view.additional.FlexWindow;
+import ui.view.additional.Outliner;
+import ui.view.additional.popup.AboutUsPopUp;
+import ui.view.additional.popup.AddElementPopUp;
+import ui.view.additional.popup.AddObjectPopUp;
+import ui.view.additional.popup.BackgroundPopUp;
+import ui.view.additional.popup.CanvasResizePopUp;
+import ui.view.additional.popup.CreateNewDialog;
+import ui.view.additional.popup.EditEdgesPopUp;
+import ui.view.additional.popup.SearchPopUp;
+import ui.view.additional.popup.CreateNewDialog.Option;
+import ui.view.componnents.ButtonTabComponent;
 import utility.ImageImport;
 
 /**
@@ -99,13 +111,11 @@ import utility.ImageImport;
  *
  * @author Gruppe14
  */
-public class GUI{
-	
-	static final Color PALE_RED=new Color(255, 192, 192);
-	
+public class GUI{	
 	/**
 	 * Menu on the Top containing File, Edit View Help etc
 	 */
+	public static final Color PALE_RED = new Color(255, 192, 192);
 	private final JMenuBar menuBar = new JMenuBar();
 	private final JMenu mnNewMenu = new JMenu("File");
 	private final JMenu mnNewMenuEdit = new JMenu("Edit");

src/ui/view/GroupNodeCanvas.java → src/ui/view/main/GroupNodeCanvas.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -35,19 +35,20 @@ import classes.HolonSwitch;
 import classes.Node;
 import classes.Position;
 import classes.Vector2d;
+import model.Consumer;
+import model.DecoratedCable;
+import model.DecoratedGroupNode;
+import model.DecoratedHolonObject;
+import model.DecoratedSwitch;
+import model.ExitCable;
+import model.Model;
+import model.Passiv;
+import model.Supplier;
+import model.DecoratedHolonObject.HolonObjectState;
+import model.DecoratedSwitch.SwitchState;
 import ui.controller.Control;
 import ui.controller.UpdateController;
-import ui.model.Consumer;
-import ui.model.DecoratedCable;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedHolonObject;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.DecoratedSwitch;
-import ui.model.ExitCable;
-import ui.model.DecoratedSwitch.SwitchState;
-import ui.model.Model;
-import ui.model.Passiv;
-import ui.model.Supplier;
+import ui.view.componnents.ButtonTabComponent;
 import utility.ImageImport;
 
 /**
@@ -61,8 +62,8 @@ public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, Mo
     // The UpperNode
     public GroupNode upperNode;
     // Path
-    protected String path;
-    int code;
+    public String path;
+    public int code;
     public boolean disable = false;
     /**
      * Constructor.
@@ -71,7 +72,7 @@ public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, Mo
      * @param control   the Controller
      * @param unitGraph
      */
-    GroupNodeCanvas(Model mod, Control control, UnitGraph unitGraph, GroupNode UpperNode, String parentPath, Component parentComponent) {
+    public GroupNodeCanvas(Model mod, Control control, UnitGraph unitGraph, GroupNode UpperNode, String parentPath, Component parentComponent) {
         toolTip = false;
 
         this.controller = control;
@@ -1218,7 +1219,7 @@ public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, Mo
      *
      * @param informations
      */
-    protected void setShowedInformation(boolean[] informations) {
+    public void setShowedInformation(boolean[] informations) {
         showedInformation = informations;
     }
 
@@ -1228,7 +1229,7 @@ public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, Mo
      *
      * @param bool
      */
-    void setToolTip(boolean bool) {
+    public void setToolTip(boolean bool) {
         this.toolTip = bool;
     }
 
@@ -1238,7 +1239,7 @@ public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, Mo
      * @param x
      * @param y
      */
-    void setXY(int x, int y) {
+    public void setXY(int x, int y) {
         this.x = x;
         this.y = y;
     }

src/ui/view/Main.java → src/ui/view/main/Main.java

@@ -1,10 +1,12 @@
-package ui.view;
+package ui.view.main;
 
 import ui.controller.Control;
-import ui.model.Model;
 
 import javax.swing.*;
 
+import model.IndexTranslator;
+import model.Model;
+
 import java.awt.*;
 
 /**

src/ui/view/MyCanvas.java → src/ui/view/main/MyCanvas.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -33,20 +33,21 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.Node;
 import classes.Position;
+import model.Consumer;
+import model.DecoratedCable;
+import model.DecoratedGroupNode;
+import model.DecoratedHolonObject;
+import model.DecoratedSwitch;
+import model.ExitCable;
+import model.Model;
+import model.Passiv;
+import model.Supplier;
+import model.VisualRepresentationalState;
+import model.DecoratedHolonObject.HolonObjectState;
+import model.DecoratedSwitch.SwitchState;
 import ui.controller.Control;
 import ui.controller.UpdateController;
-import ui.model.Consumer;
-import ui.model.DecoratedCable;
-import ui.model.DecoratedGroupNode;
-import ui.model.DecoratedHolonObject;
-import ui.model.DecoratedHolonObject.HolonObjectState;
-import ui.model.DecoratedSwitch;
-import ui.model.ExitCable;
-import ui.model.DecoratedSwitch.SwitchState;
-import ui.model.Model;
-import ui.model.Passiv;
-import ui.model.Supplier;
-import ui.model.VisualRepresentationalState;
+import ui.view.componnents.ButtonTabComponent;
 import utility.ImageImport;
 
 /**
@@ -1067,7 +1068,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 	 *
 	 * @return Array of boolean [0] = connection, [1] = objects
 	 */
-	boolean[] getShowedInformation() {
+	public boolean[] getShowedInformation() {
 		return showedInformation;
 	}
 
@@ -1076,7 +1077,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 	 *
 	 * @param bool
 	 */
-	void setToolTip(boolean bool) {
+	public void setToolTip(boolean bool) {
 		this.toolTip = bool;
 	}
 
@@ -1086,7 +1087,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 	 * @param x
 	 * @param y
 	 */
-	void setXY(int x, int y) {
+	public void setXY(int x, int y) {
 		this.x = x;
 		this.y = y;
 	}

src/ui/view/PropertyTable.java → src/ui/view/main/PropertyTable.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import javax.swing.table.DefaultTableModel;
 

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

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -44,7 +44,7 @@ import utility.ImageImport;
  */
 public class TimePanel extends JPanel implements ActionListener{
 
-	private static final long serialVersionUID = 1L;
+	private static final Color PALE_RED = new Color(255, 192, 192);
 	private static final int MAX_ITERATIONS=100000;
 	/*
 	 * variable for calculating the performance
@@ -317,7 +317,7 @@ public class TimePanel extends JPanel implements ActionListener{
 					futureTask = s.schedule((Runnable)() -> updateIterationsInput(), 1, TimeUnit.SECONDS);
 					hint.setText(" ");
 				}catch(NumberFormatException n){
-					iterationsField.setBackground(GUI.PALE_RED);//red stings
+					iterationsField.setBackground(PALE_RED);//red stings
 					hint.setText("Invalid");
 				}
 			}

src/ui/view/UnitGraph.java → src/ui/view/main/UnitGraph.java

@@ -1,4 +1,4 @@
-package ui.view;
+package ui.view.main;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -22,9 +22,9 @@ import classes.Position;
 import classes.UnitGraphPoint;
 import interfaces.GraphEditable;
 import interfaces.GraphEditable.Graphtype;
+import model.Model;
 import interfaces.LocalMode;
 import ui.controller.Control;
-import ui.model.Model;
 
 /**
  * This Class represents a Graph where the User can model the behavior of

tests/tests/PraktikumHolonsTestAutoSaveController.java

@@ -2,10 +2,12 @@ package tests;
 
 import org.junit.Before;
 import org.junit.Test;
+
+import model.Model;
+
 import static org.junit.Assert.*;
 
 import ui.controller.AutoSaveController;
-import ui.model.Model;
 /**
  * Tests for the AutoSaveController.
  * 

tests/tests/PraktikumHolonsTestCanvasController.java

@@ -5,10 +5,10 @@ import classes.Edge;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.IdCounter;
+import model.Model;
 import ui.controller.CanvasController;
 import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
-import ui.model.Model;
 
 import org.junit.Test;
 import org.junit.Before;

tests/tests/PraktikumHolonsTestCategoryController.java

@@ -7,9 +7,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 import classes.HolonObject;
+import model.Model;
 import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
-import ui.model.Model;
 
 /**
  * Tests for the CategoryController.

tests/tests/PraktikumHolonsTestGlobalController.java

@@ -5,8 +5,8 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 
+import model.Model;
 import ui.controller.GlobalController;
-import ui.model.Model;
 
 /**
  * Test for the GlobalController.

tests/tests/PraktikumHolonsTestLoadAndStoreController.java

@@ -1,6 +1,7 @@
 package tests;
 
 import classes.IdCounter;
+import model.Model;
 import ui.controller.CanvasController;
 import ui.controller.CategoryController;
 import ui.controller.GlobalController;
@@ -8,7 +9,6 @@ import ui.controller.LoadController;
 import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.controller.SaveController;
-import ui.model.Model;
 
 /**
  * Tests for LoadAndStoreController.

tests/tests/PraktikumHolonsTestObjectController.java

@@ -7,11 +7,11 @@ import org.junit.Test;
 
 import classes.AbstractCanvasObject;
 import classes.HolonObject;
+import model.Model;
 import ui.controller.CanvasController;
 import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
-import ui.model.Model;
 
 /**
  * Tests for the ObjectController.